From 59e4e02bfe03dde743af2fc38c86389461e890c0 Mon Sep 17 00:00:00 2001 From: Vyacheslav Barinov Date: Tue, 18 Aug 2015 14:02:07 +0300 Subject: [PATCH] Added libcrypto dependency to build with modern OpenSSL Parallel build enabled to speedup build. Change-Id: I0d37e6e3e9f6f5431328f247227671675e6a4d32 Signed-off-by: Vyacheslav Barinov --- client/CMakeLists.txt | 2 +- daemon/CMakeLists.txt | 4 ++-- packaging/nfc-manager-neard.spec | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 518d1e5..a7ae306 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -16,7 +16,7 @@ IF(WAYLAND_SUPPORT) ENDIF(WAYLAND_SUPPORT) INCLUDE(FindPkgConfig) pkg_check_modules(client_pkgs REQUIRED dlog vconf libtzplatform-config neardal - libssl appsvc feedback capi-media-wav-player ${WIN_PKG}) + libssl libcrypto appsvc feedback capi-media-wav-player ${WIN_PKG}) IF(WAYLAND_SUPPORT) ADD_DEFINITIONS("-DHAVE_WAYLAND") diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 0cfb65f..7ec36b1 100755 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -17,12 +17,12 @@ ENDIF(WAYLAND_SUPPORT) INCLUDE(FindPkgConfig) IF(ARM_TARGET) pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0 - vconf dlog tapi appsvc libcurl libssl feedback capi-media-wav-player + vconf dlog tapi appsvc libcurl libssl libcrypto feedback capi-media-wav-player pkgmgr pkgmgr-info capi-network-wifi pmapi capi-network-wifi-direct libtzplatform-config neardal ${WIN_PKG}) ELSE(ARM_TARGET) pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0 - vconf dlog tapi appsvc libcurl libssl feedback capi-media-wav-player + vconf dlog tapi appsvc libcurl libssl libcrypto feedback capi-media-wav-player pkgmgr pkgmgr-info capi-network-wifi pmapi libtzplatform-config neardal ${WIN_PKG}) ENDIF(ARM_TARGET) diff --git a/packaging/nfc-manager-neard.spec b/packaging/nfc-manager-neard.spec index 0919380..ff19125 100755 --- a/packaging/nfc-manager-neard.spec +++ b/packaging/nfc-manager-neard.spec @@ -26,6 +26,7 @@ BuildRequires: pkgconfig(appsvc) BuildRequires: pkgconfig(feedback) BuildRequires: pkgconfig(capi-media-wav-player) BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(pkgmgr-info) @@ -110,6 +111,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -DX11_SUPPORT=Off %endif +make %{?_smp_mflags} %install %make_install -- 2.7.4