Ticket #246: kdesvn-1.2.0-asneeded.patch

kdesvn-kde4-1.2.0.20080926/src/CMakeLists.txt

@@ -54 +54 @@
     )
 SET_TARGET_PROPERTIES(kdesvnpart
     PROPERTIES
-    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
+    LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}")
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
 

kdesvn-kde4-1.2.0.20080926/src/svnqt/CMakeLists.txt

@@ -145 +145 @@
 
 SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
 SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "-Wl,--as-needed ${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
 TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${QT_QTSQL_LIBRARY})
 
 IF (WIN32)

kdesvn-kde4-1.2.0.20080926/src/svnqt/cmakemodules/FindSubversion.cmake

@@ -58 +58 @@
     MESSAGE(SEND_ERROR "Error: no apu-config found")
   endif(NOT APU_CONFIG)
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR)
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}")
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
+
+  EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
+
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
+  SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
 
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS)
-
-  EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS)
-  EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS)
+  EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}")
 
   CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H)
 
@@ -180 +195 @@
     "$ENV{ProgramFiles}/Subversion/lib"
   )
 
-  SET(APR_EXTRA_LIBFLAGS )
-  SET(APU_EXTRA_LIBFLAGS )
+  SET(APR_EXTRA_LIBS )
+  SET(APR_EXTRA_LDFLAGS )
+  SET(APU_EXTRA_LIBS )
+  SET(APU_EXTRA_LDFLAGS )
 
 
   # check found libraries
@@ -189 +206 @@
     MESSAGE(SEND_ERROR "No apr lib found!")
   ELSE (NOT APR_LIB)
     MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS})
   endif(NOT APR_LIB)
 
   if (NOT APRICONV_LIB)
@@ -203 +220 @@
     MESSAGE(SEND_ERROR "No aprutil lib found!")
   ELSE (NOT APU_LIB)
     MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
-    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
+    SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS})
   endif(NOT APU_LIB)
 
   if (NOT APU_XMLLIB)