Added libcrypto dependency for build with modern OpenSSL 60/46260/1
authorVyacheslav Barinov <v.barinov@samsung.com>
Tue, 18 Aug 2015 13:08:26 +0000 (16:08 +0300)
committerVyacheslav Barinov <v.barinov@samsung.com>
Tue, 18 Aug 2015 13:08:26 +0000 (16:08 +0300)
Parallel build enabled to speedup build.

Change-Id: I7564f81fde0e0bbcba060688bb82119e85dfa42b
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>
common/CMakeLists.txt
packaging/smartcard-service.spec

index 6469fb2..bf7c6d1 100644 (file)
@@ -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
index cf565ce..24e82b8 100644 (file)
@@ -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