diff options
| author | Vyacheslav Barinov <v.barinov@samsung.com> | 2015-08-18 16:08:26 +0300 |
|---|---|---|
| committer | Vyacheslav Barinov <v.barinov@samsung.com> | 2015-08-18 16:08:26 +0300 |
| commit | ab1983ab70f61aeed64176c128bb028dc89962bc (patch) | |
| tree | 1efa8491bae690bee1ea86a4ecb329a072dc8739 | |
| parent | 75ed6fedbde1601b1619ddb3a56b674a005b8974 (diff) | |
| download | smartcard-service-ab1983ab70f61aeed64176c128bb028dc89962bc.tar.gz smartcard-service-ab1983ab70f61aeed64176c128bb028dc89962bc.tar.bz2 smartcard-service-ab1983ab70f61aeed64176c128bb028dc89962bc.zip | |
Added libcrypto dependency for build with modern OpenSSL
Parallel build enabled to speedup build.
Change-Id: I7564f81fde0e0bbcba060688bb82119e85dfa42b
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>
| -rw-r--r-- | common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/smartcard-service.spec | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 6469fb2..bf7c6d1 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -15,7 +15,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SRCS) #MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs_common REQUIRED glib-2.0 gio-unix-2.0 dlog aul libssl pkgmgr pkgmgr-info) +pkg_check_modules(pkgs_common REQUIRED glib-2.0 gio-unix-2.0 dlog aul libssl libcrypto pkgmgr pkgmgr-info) MESSAGE("${LIB_NAME} ld flag : ${pkgs_common_LDFLAGS}") @@ -53,13 +53,13 @@ SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${VERSION}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_common_LDFLAGS}) -SET(EXPORT_HEADER +SET(EXPORT_HEADER include/smartcard-types.h include/Debug.h include/Exception.h include/ByteArray.h include/Lock.h - include/Synchronous.h + include/Synchronous.h include/TerminalInterface.h include/Terminal.h include/SignatureHelper.h diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec index cf565ce..24e82b8 100644 --- a/packaging/smartcard-service.spec +++ b/packaging/smartcard-service.spec @@ -21,6 +21,7 @@ BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: python @@ -182,8 +183,8 @@ export LDFLAGS+="-Wl,-Bsymbolic-functions" mkdir obj-arm-limux-qnueabi cd obj-arm-limux-qnueabi %cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} %{?use_autostart} %{?use_gdbus} %{?test_client} -#make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install cd obj-arm-limux-qnueabi |