Ticket #246: kdesvn-1.0.0-asneeded.patch
| File kdesvn-1.0.0-asneeded.patch, 5.1 KB (added by orion@…, 19 months ago) |
|---|
-
kdesvn-1.0.0/src/CMakeLists.txt
old new 37 37 ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} ) 38 38 SET_TARGET_PROPERTIES(kdesvnpart 39 39 PROPERTIES 40 LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_L IBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")40 LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}") 41 41 42 42 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt) 43 43 -
kdesvn-1.0.0/src/svnqt/CMakeLists.txt
old new 177 177 SOVERSION ${LIB_MAJOR} 178 178 VERSION ${_soversion}) 179 179 180 SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS}) 181 SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}") 182 SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}") 180 SET(ALL_LINKFLAGS "${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS}") 181 SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "-Wl,--as-needed ${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}") 183 182 TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS}) 184 183 185 184 IF (SQLITE_FOUND AND NOT QT4_FOUND) -
kdesvn-1.0.0/src/svnqt/cmakemodules/FindSubversion.cmake
old new 58 58 MESSAGE(SEND_ERROR "Error: no apu-config found") 59 59 endif(NOT APU_CONFIG) 60 60 61 EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR) 62 EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR) 61 EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) 62 MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}") 63 EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) 64 MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}") 65 66 EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) 67 MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}") 68 EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) 69 MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}") 70 71 EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE) 72 MESSAGE(STATUS "Found apr libs: ${APR_LIBS}") 73 SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS}) 74 75 EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) 76 MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}") 77 78 EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE) 79 MESSAGE(STATUS "Found apu libs: ${APU_LIBS}") 80 SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS}) 63 81 64 EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS) 65 EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS) 66 67 EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS) 68 EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS) 82 EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) 83 MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}") 69 84 70 85 CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H) 71 86 … … 180 195 "$ENV{ProgramFiles}/Subversion/lib" 181 196 ) 182 197 183 SET(APR_EXTRA_LIBFLAGS ) 184 SET(APU_EXTRA_LIBFLAGS ) 198 SET(APR_EXTRA_LIBS ) 199 SET(APR_EXTRA_LDFLAGS ) 200 SET(APU_EXTRA_LIBS ) 201 SET(APU_EXTRA_LDFLAGS ) 185 202 186 203 187 204 # check found libraries … … 189 206 MESSAGE(SEND_ERROR "No apr lib found!") 190 207 ELSE (NOT APR_LIB) 191 208 MESSAGE(STATUS "Found apr lib: ${APR_LIB}") 192 SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} )209 SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS}) 193 210 endif(NOT APR_LIB) 194 211 195 212 if (NOT APRICONV_LIB) … … 203 220 MESSAGE(SEND_ERROR "No aprutil lib found!") 204 221 ELSE (NOT APU_LIB) 205 222 MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}") 206 SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} )223 SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS}) 207 224 endif(NOT APU_LIB) 208 225 209 226 if (NOT APU_XMLLIB) -
kdesvn-1.0.0/src/kdesvnd/CMakeLists.txt
old new 23 23 24 24 SET_TARGET_PROPERTIES(kded_kdesvnd 25 25 PROPERTIES 26 LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_L IBFLAGS} ${APU_EXTRA_LIBFLAGS} -avoid-version -module")26 LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} -avoid-version -module") 27 27 28 28 INSTALL(TARGETS kded_kdesvnd 29 29 RUNTIME DESTINATION ${BIN_INSTALL_DIR}
