Hi, Niels Thykier <[email protected]> (06/05/2010): > As I mentioned I got a possible patch for the issue[1], though no > FreeBSD system to test on. Could I have you check if it works?
Sure. Almost. ;) -lbsd is missing, since strlcpy() is used. I'm attaching a refreshed patch which fixes that. Then one ends up with different symbols: dh_makeshlibs --- debian/libsysactivity0.symbols (libsysactivity0_0.5.1-2~test_kfreebsd-i386) +++ dpkg-gensymbolsGdZmqW 2010-05-07 14:26:59.000000000 +0200 @@ -1,8 +1,8 @@ libsysactivity.so.0 libsysactivity0 #MINVER# - sa_close_...@base 0.5.1 - sa_close_data_stor...@base 0.5.1 - sa_close_mem...@base 0.5.1 - sa_close_netw...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_close_...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_close_data_stor...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_close_mem...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_close_netw...@base 0.5.1 sa_close_proc...@base 0.5.1 sa_count_c...@base 0.5.1 sa_count_data_stora...@base 0.5.1 @@ -21,8 +21,8 @@ sa_get_processes_...@base 0.5.1 sa_get_s...@base 0.5.1 sa_get_sw...@base 0.5.1 - sa_open_...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_open_...@base 0.5.1 sa_open_data_stor...@base 0.5.1 sa_open_mem...@base 0.5.1 - sa_open_netw...@base 0.5.1 - sa_open_proc...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_open_netw...@base 0.5.1 +#MISSING: 0.5.1-2~test# sa_open_proc...@base 0.5.1 dh_makeshlibs: dpkg-gensymbols -plibsysactivity0 -Idebian/libsysactivity0.symbols -Pdebian/libsysactivity0 returned exit code 1 Mraw, KiBi.
Description: Fixes FTBFS with Debian's FreeBSD which identifies themselves as "kFreeBSD" rather than FreeBSD. Author: Niels Thykier <[email protected]> Forwarded: no --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,4 +24,8 @@ ADD_SUBDIRECTORY(common) # Specific code INCLUDE_DIRECTORIES(common/) -ADD_SUBDIRECTORY(${CMAKE_SYSTEM_NAME}) +if (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") + ADD_SUBDIRECTORY("FreeBSD") +else () + ADD_SUBDIRECTORY(${CMAKE_SYSTEM_NAME}) +endif () --- a/src/FreeBSD/CMakeLists.txt +++ b/src/FreeBSD/CMakeLists.txt @@ -14,6 +14,6 @@ endif (HAS_VISIBILITY_FLAG) ADD_LIBRARY(sysactivity SHARED ${LIBSA_SPECIFIC_SRCS}) SET_TARGET_PROPERTIES(sysactivity PROPERTIES VERSION ${LIBSA_VERSION} SOVERSION 0) -TARGET_LINK_LIBRARIES(sysactivity) +TARGET_LINK_LIBRARIES(sysactivity bsd) INSTALL(TARGETS sysactivity LIBRARY DESTINATION ${LIB_INSTALLATION_DIR})
signature.asc
Description: Digital signature
