File linking.patch of Package passwordsafe

Overview Repositories Revisions Requests Users Attributes Meta

File linking.patch of Package passwordsafe (Revision e783d8157e3d15d397c23c80d1ffd163)

Currently displaying revision e783d8157e3d15d397c23c80d1ffd163 , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3f753bc5..9c2ba46a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,6 +381,7 @@ else ()
   endif (NOT NO_QR)
   target_link_libraries(pwsafe ${wxWidgets_LIBRARIES} uuid Xtst X11 curl ${OPENSSL_SSL_LIBRARY} ${MAGIC_LIBRARIES}
   ${CMAKE_REQUIRED_LIBRARIES})
+  set_target_properties(pwsafe PROPERTIES LINK_FLAGS "-z relro -fpie -pie")
 endif()
 
 if (IPO_SUPPORTED)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 6ed43ab92..60fa2608c 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -99,4 +99,8 @@ else (NOT WIN32 OR WX_WINDOWS)
   list (APPEND CORE_SRCS core.rc2)
 endif(NOT WIN32 OR WX_WINDOWS)
 
-add_library(core ${CORE_SRCS})
+add_library(core STATIC ${CORE_SRCS})
+target_link_libraries(core os ${MAGIC_LIBRARIES})
+if (XML_XERCESC)
+  target_link_libraries(core ${XercesC_LIBRARY})
+endif (XML_XERCESC)
diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt
index 4a36022de..d8e2c85c9 100644
--- a/src/os/CMakeLists.txt
+++ b/src/os/CMakeLists.txt
@@ -87,4 +87,9 @@ if(HAVE_YKPERS_H)
     list(APPEND OS_SRCS ${OS_YUBI_SRC})
 endif()
 
-add_library(os ${OS_SRCS})
+add_library(os STATIC ${OS_SRCS})
+target_link_libraries(os core Xtst X11)
+
+if (HAVE_YKPERS_H)
+  target_link_libraries(os ykpers-1)
+endif (HAVE_YKPERS_H)
diff --git a/src/ui/cli/CMakeLists.txt b/src/ui/cli/CMakeLists.txt
index dd8734800..6f4da977e 100644
--- a/src/ui/cli/CMakeLists.txt
+++ b/src/ui/cli/CMakeLists.txt
@@ -28,7 +28,7 @@ if (IPO_SUPPORTED)
 endif (IPO_SUPPORTED)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   # squash lintian hardening-no-relro warning, probably good for all Linuxen
-  set_target_properties(pwsafe-cli PROPERTIES LINK_FLAGS "-z relro")
+  set_target_properties(pwsafe-cli PROPERTIES LINK_FLAGS "-z relro -fpie -pie")
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 target_link_libraries(pwsafe-cli core os core uuid pthread magic ${wxWidgets_LIBRARIES})

Places

File linking.patch of Package passwordsafe (Revision e783d8157e3d15d397c23c80d1ffd163)

Places