recipes-tizen/security-server/security-server/deprecated-systemd.patch

   1 From b45e88111f94323e715c5ad4fd1527ea9099ce7b Mon Sep 17 00:00:00 2001
   2 From: Xavier Roche <xavrock.os@gmail.com>
   3 Date: Tue, 20 May 2014 09:51:34 +0200
   4 Subject: [PATCH] Fix Security server build on Yocto poky
   5
   6  - Fixing lib install dir in CMakeLists files and .pc template files
   7  - Fixing deprecated depedencies to systemd library
   8
   9 Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
  10 ---
  11  CMakeLists.txt                              |    2 --
  12  build/security-server/CMakeLists.txt        |    2 +-
  13  build/security-server/security-server.pc.in |    2 +-
  14  src/CMakeLists.txt                          |    4 ++--
  15  src/server/CMakeLists.txt                   |    5 +++--
  16  5 files changed, 7 insertions(+), 8 deletions(-)
  17
  18 diff --git a/CMakeLists.txt b/CMakeLists.txt
  19 index 476b94a..09a1105 100644
  20 --- a/CMakeLists.txt
  21 +++ b/CMakeLists.txt
  22 @@ -48,8 +48,6 @@ ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
  23  ADD_DEFINITIONS("-Wall")                        # Generate all warnings
  24  ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
  25
  26 -STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}")
  27 -ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
  28
  29  ADD_DEFINITIONS("-DSMACK_ENABLED")
  30
  31 diff --git a/build/security-server/CMakeLists.txt b/build/security-server/CMakeLists.txt
  32 index ddc0fb7..d65dd3a 100644
  33 --- a/build/security-server/CMakeLists.txt
  34 +++ b/build/security-server/CMakeLists.txt
  35 @@ -22,5 +22,5 @@ CONFIGURE_FILE(security-server.pc.in security-server.pc @ONLY)
  36  INSTALL(FILES
  37      ${CMAKE_BINARY_DIR}/build/security-server/security-server.pc
  38      DESTINATION
  39 -    ${LIB_INSTALL_DIR}/pkgconfig
  40 +    lib/pkgconfig
  41      )
  42 diff --git a/build/security-server/security-server.pc.in b/build/security-server/security-server.pc.in
  43 index 608cb2d..df49caf 100644
  44 --- a/build/security-server/security-server.pc.in
  45 +++ b/build/security-server/security-server.pc.in
  46 @@ -1,6 +1,6 @@
  47  prefix=@CMAKE_INSTALL_PREFIX@
  48  exec_prefix=${prefix}
  49 -libdir=@LIB_INSTALL_DIR@
  50 +libdir=${prefix}/lib
  51  includedir=${prefix}/include
  52
  53  Name: security-server
  54 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  55 index b0270d4..e238087 100644
  56 --- a/src/CMakeLists.txt
  57 +++ b/src/CMakeLists.txt
  58 @@ -3,7 +3,7 @@ PKG_CHECK_MODULES(SECURITY_SERVER_DEP
  59      openssl
  60      libsmack
  61      libprivilege-control
  62 -    libsystemd-daemon
  63 +    systemd
  64      REQUIRED
  65      )
  66
  67 @@ -93,7 +93,7 @@ TARGET_LINK_LIBRARIES(${TARGET_SECURITY_CLIENT}
  68
  69  ################################################################################
  70
  71 -INSTALL(TARGETS ${TARGET_SECURITY_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
  72 +INSTALL(TARGETS ${TARGET_SECURITY_CLIENT} DESTINATION lib)
  73
  74  INSTALL(TARGETS ${TARGET_SECURITY_SERVER} DESTINATION bin)
  75
  76 diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
  77 index 2cd6177..e493c51 100644
  78 --- a/src/server/CMakeLists.txt
  79 +++ b/src/server/CMakeLists.txt
  80 @@ -1,5 +1,6 @@
  81  PKG_CHECK_MODULES(COMMON_DEP
  82      dlog
  83 +    systemd
  84      REQUIRED
  85      )
  86
  87 @@ -44,10 +45,10 @@ SET_TARGET_PROPERTIES(
  88      )
  89
  90  TARGET_LINK_LIBRARIES(${TARGET_SERVER_COMMON}
  91 -    ${COMMON_DEP_LIBRARIES}
  92 +    ${COMMON_DEP_LIBRARIES} -lsystemd
  93      )
  94
  95  ################################################################################
  96
  97 -INSTALL(TARGETS ${TARGET_SERVER_COMMON} DESTINATION ${LIB_INSTALL_DIR})
  98 +INSTALL(TARGETS ${TARGET_SERVER_COMMON} DESTINATION lib)
  99
 100 --
 101 1.7.9.5
 102