From 60698e1acfbc700957c2bf5000c522b67d7fd3b2 Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Wed, 15 May 2019 18:10:52 +0200 Subject: [PATCH] Remove unnecessary dependencies Do not expose unnecessary libraries to the program that is linking with libcryptsvc library. If the program will not be using the symbols of the required library, it should not be linking directly to that library. pkg-config guide: https://people.freedesktop.org/~dbn/pkg-config-guide.html Change-Id: I7faa0e7b8414d3fd0ee7bb864239c2c50c86de37 --- CMakeLists.txt | 1 - cryptsvc.pc.in | 2 +- include/SecCryptoSvc.h | 8 +------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9805779..bc10468 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,6 @@ INSTALL(TARGETS ${TARGET_DEVICE_INFO} DESTINATION ${LIB_INSTALL_DIR}) ######################################################################################### -SET(PC_REQUIRED ${CRYPTSVC_REQUIRES}) CONFIGURE_FILE(${TARGET_CRYPTSVC}.pc.in ${TARGET_CRYPTSVC}.pc @ONLY) INSTALL(FILES ${TARGET_CRYPTSVC}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/cryptsvc.pc.in b/cryptsvc.pc.in index fef725f..1924672 100644 --- a/cryptsvc.pc.in +++ b/cryptsvc.pc.in @@ -7,7 +7,7 @@ includedir=${prefix}/include Name: cryptsvc Description: @DESCRIPTION@ Version: @VERSION@ -Requires: @PC_REQUIRED@ +Requires: Libs: -L${libdir} -lcryptsvc Cflags: -I${includedir} diff --git a/include/SecCryptoSvc.h b/include/SecCryptoSvc.h index 00d3c04..c1c69a9 100644 --- a/include/SecCryptoSvc.h +++ b/include/SecCryptoSvc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 - 2016 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2000 - 2019 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,12 +25,6 @@ extern "C" #include -//#ifdef OPENSSL_NO_ENGINE -//#error Do not use define -//#else -#include -//#endif - /*typedef enum { SEC_CRYPTO_CIPHER_NULL = 0, -- 2.7.4