sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
346 discussions

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,buster,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,bookworm,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

Jenkins build is back to normal : kamailiodev-nightly-repos » amd64,stretch,master #2605
by kamailio＠sipwise.com 03 Dec '24

03 Dec '24

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-repos/architecture=amd…>

1 0

[kamailio/kamailio] Error compiling with cmake on macos/darwin (Issue #4049)
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

### Description Using `cmake` to compile on MacOS (Darwin) 15.1.1 (Sequoia) fails. ### Troubleshooting #### Reproduction  #### Debugging Data ``` mkdir buildmac cd buildmac/ cmake .. make VERBOSE=1 /opt/local/bin/cmake -S/tmp/kamailio -B/tmp/kamailio/buildmac --check-build-system CMakeFiles/Makefile.cmake 0 /opt/local/bin/cmake -E cmake_progress_start /tmp/kamailio/buildmac/CMakeFiles /tmp/kamailio/buildmac//CMakeFiles/progress.marks /Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/Makefile2 all /Applications/Xcode.app/Contents/Developer/usr/bin/make -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/depend cd /tmp/kamailio/buildmac && /opt/local/bin/cmake -E cmake_depends "Unix Makefiles" /tmp/kamailio /tmp/kamailio/src/core /tmp/kamailio/buildmac /tmp/kamailio/buildmac/src/core /tmp/kamailio/buildmac/src/core/CMakeFiles/GenerateParser.dir/DependInfo.cmake "--color=" Dependencies file "src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o.d" is newer than depends file "/tmp/kamailio/buildmac/src/core/CMakeFiles/GenerateParser.dir/compiler_depend.internal". Consolidate compiler generated dependencies of target GenerateParser /Applications/Xcode.app/Contents/Developer/usr/bin/make -f src/core/CMakeFiles/GenerateParser.dir/build.make src/core/CMakeFiles/GenerateParser.dir/build [ 0%] Building C object src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o cd /tmp/kamailio/buildmac/src/core && /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/cc -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DARCH=\"arm64\" -DCFG_DIR=\"/usr/local/etc/kamailio/\" -DCOMPILER=\"16.0.0.16000026\" -DDBG_SR_MEMORY -DDISABLE_NAGLE -DDNS_IP_HACK -DFAST_LOCK -DFMSTATS -DF_MALLOC -DHAVE_RESOLV_RES -DKMSTATS -DKSR_PTHREAD_MUTEX_SHARED -DMALLOC_STATS -DNAME=\"kamailio\" -DOS=Darwin -DOS_QUOTED=\"Darwin\" -DPIC -DPKG_MALLOC -DQ_MALLOC -DRAW_SOCKS -DRUN_DIR=\"/var/run/kamailio\" -DSHARE_DIR=\"/usr/local/share/kamailio/\" -DSHM_MMAP -DSTATISTICS -DTLSF_MALLOC -DTLS_HOOKS -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_FUTEX -DUSE_MCAST -DUSE_NAPTR -DUSE_SCTP -DUSE_TCP -DUSE_TLS -DVERSION=\"6.0.0-dev2\" -DVERSIONVAL=6000000 -D__CPU_arm64 -D__OS_darwin -std=gnu11 -arch arm64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.1.sdk -MD -MT src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o -MF CMakeFiles/GenerateParser.dir/lex.yy.c.o.d -o CMakeFiles/GenerateParser.dir/lex.yy.c.o -c /tmp/kamailio/src/core/lex.yy.c In file included from /tmp/kamailio/src/core/cfg.lex:33: In file included from /tmp/kamailio/src/core/globals.h:34: In file included from /tmp/kamailio/src/core/ip_addr.h:39: In file included from /tmp/kamailio/src/core/ut.h:46: In file included from /tmp/kamailio/src/core/mem/shm_mem.h:32: In file included from /tmp/kamailio/src/core/mem/shm.h:44: In file included from /tmp/kamailio/src/core/mem/../lock_ops.h:92: /tmp/kamailio/src/core/mem/../fastlock.h:130:2: error: "unknown architecture" 130 | #error "unknown architecture" | ^ /tmp/kamailio/src/core/mem/../fastlock.h:294:2: error: "unknown architecture" 294 | #error "unknown architecture" | ^ /tmp/kamailio/src/core/mem/../fastlock.h:317:2: error: call to undeclared function 'membar_getlock'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 317 | membar_getlock(); | ^ /tmp/kamailio/src/core/mem/../fastlock.h:328:2: error: call to undeclared function 'membar_getlock'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 328 | membar_getlock(); | ^ /tmp/kamailio/src/core/mem/../fastlock.h:436:2: error: "unknown architecture" 436 | #error "unknown architecture" | ^ 5 errors generated. make[2]: *** [src/core/CMakeFiles/GenerateParser.dir/lex.yy.c.o] Error 1 make[1]: *** [src/core/CMakeFiles/GenerateParser.dir/all] Error 2 make: *** [all] Error 2 ``` Compiling with the old Makefiles (just git clone and then `make Q=0`), the compile command looks like: ``` gcc -g -pthread -DKSR_PTHREAD_MUTEX_SHARED -Wunused-variable -Wuninitialized -DNAME='"kamailio"' -DVERSION='"6.0.0-dev3"' -DARCH='"arm64"' -DOS='darwin_' -DOS_QUOTED='"darwin"' -DCOMPILER='"gcc Apple clang version 16.0.0 (clang-1600.0.26.4)"' -D__CPU_arm64 -D__OS_darwin -DVERSIONVAL=6000000 -DCFG_DIR='"/opt/local/etc/kamailio/"' -DSHARE_DIR='"/opt/local/share/kamailio/"' -DRUN_DIR='"/var/run/kamailio/"' -DPKG_MALLOC -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLOCKLIST -DUSE_NAPTR -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DDBG_SR_MEMORY -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DUSE_SCTP -DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL -DUSE_ANON_MMAP -DNDEBUG -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM -DUSE_SIGWAIT -DHAVE_IP_MREQN -DUSE_PTHREAD_MUTEX -DUSE_SYSV_SEM -DHAVE_KQUEUE -DHAVE_SELECT -c core/lex.yy.c -o core/lex.yy.o ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Kamailio master branch ``` * **Operating System**: ``` ❯ uname -a Darwin Mac 24.1.0 Darwin Kernel Version 24.1.0: Thu Oct 10 21:03:11 PDT 2024; root:xnu-11215.41.3~2/RELEASE_ARM64_T6020 arm64 ❯ uname -m arm64 ❯ uname -p arm ❯ cmake --version cmake version 3.29.5 CMake suite maintained and supported by Kitware (kitware.com/cmake). ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4049 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4049(a)github.com>

3 14

git:master:2d59d44d: cmake/os-specific/darwin.cmake: added compile flag HAVE_MSGHDR_MSG_CONTROL
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 2d59d44dd620c597e69f7f1b3d6a9d1b3d410ae3 URL: https://github.com/kamailio/kamailio/commit/2d59d44dd620c597e69f7f1b3d6a9d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-03T16:55:57+01:00 cmake/os-specific/darwin.cmake: added compile flag HAVE_MSGHDR_MSG_CONTROL --- Modified: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/2d59d44dd620c597e69f7f1b3d6a9d1… Patch: https://github.com/kamailio/kamailio/commit/2d59d44dd620c597e69f7f1b3d6a9d1… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake index 9fcc61f628d..5af299c2681 100644 --- a/cmake/os-specific/darwin.cmake +++ b/cmake/os-specific/darwin.cmake @@ -10,6 +10,7 @@ target_compile_definitions( HAVE_UNION_SEMUN HAVE_SCHED_YIELD USE_ANON_MMAP + HAVE_MSGHDR_MSG_CONTROL NDEBUG # NDEBUG used to turn off assert (assert wants to call # eprintf which doesn't seem to be defined in any shared lib HAVE_CONNECT_ECONNRESET_BUG

1 0

git:master:d416f720: cmake/defs.cmake: reorganize condition on cpu to prevent mismatching arm64
by Daniel-Constantin Mierla 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: d416f7207a39db5ec15c0133904bfd76980a9d4b URL: https://github.com/kamailio/kamailio/commit/d416f7207a39db5ec15c0133904bfd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-03T16:55:57+01:00 cmake/defs.cmake: reorganize condition on cpu to prevent mismatching arm64 - arm64 was matched by arm6 --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/d416f7207a39db5ec15c0133904bfd7… Patch: https://github.com/kamailio/kamailio/commit/d416f7207a39db5ec15c0133904bfd7… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 10940d2030c..4214ef57121 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -136,9 +136,13 @@ option(USE_FAST_LOCK "Use fast locking if available" ON) # if(USE_FAST_LOCK) if(CMAKE_SYSTEM_PROCESSOR MATCHES - "i386|x86_64|sparc64|sparc|arm6|arm7|ppc|ppc64|alpha|mips2|mips64" + "i386|x86_64|sparc64|sparc|ppc|ppc64|alpha|mips2|mips64" ) set(USE_FAST_LOCK YES) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") + set(USE_FAST_LOCK NO) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm6|arm7") + set(USE_FAST_LOCK YES) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64") set(USE_FAST_LOCK YES) target_compile_definitions(common INTERFACE NOSMP) # memory barriers not

1 0

git:master:4c7d99c2: cmake: Delete macos.cmake...
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 4c7d99c2f65749dcc7aa9a7173c22c9d39ecdbe9 URL: https://github.com/kamailio/kamailio/commit/4c7d99c2f65749dcc7aa9a7173c22c9… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:49:19Z cmake: Delete macos.cmake... --- Removed: cmake/os-specific/macos.cmake --- Diff: https://github.com/kamailio/kamailio/commit/4c7d99c2f65749dcc7aa9a7173c22c9… Patch: https://github.com/kamailio/kamailio/commit/4c7d99c2f65749dcc7aa9a7173c22c9… --- diff --git a/cmake/os-specific/macos.cmake b/cmake/os-specific/macos.cmake deleted file mode 100644 index 9fcc61f628d..00000000000 --- a/cmake/os-specific/macos.cmake +++ /dev/null @@ -1,41 +0,0 @@ -message( - STATUS - "Configuring for Darwin (Apple stationary operating systems (macOS, OS X, etc.)" -) - -target_compile_definitions( - common - INTERFACE HAVE_SOCKADDR_SA_LEN - HAVE_GETHOSTBYNAME2 - HAVE_UNION_SEMUN - HAVE_SCHED_YIELD - USE_ANON_MMAP - NDEBUG # NDEBUG used to turn off assert (assert wants to call - # eprintf which doesn't seem to be defined in any shared lib - HAVE_CONNECT_ECONNRESET_BUG - HAVE_TIMEGM - USE_SIGWAIT - HAVE_IP_MREQN -) - -target_link_libraries(common INTERFACE resolv) - -message(STATUS "USE_FAST_LOCK = ${USE_FAST_LOCK}") -if(NOT ${USE_FAST_LOCK}) - target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) -endif() - -set(CMAKE_MODULE_LINKER_FLAGS - "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress" -) -set(CMAKE_SHARED_LINKER_FLAGS - "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" -) - -if(NOT DEFINED ${NO_SELECT}) - target_compile_definitions(common INTERFACE HAVE_SELECT) -endif() - -if(NOT DEFINED ${NO_KQUEUE}) - target_compile_definitions(common INTERFACE HAVE_KQUEUE) -endif()

1 0

git:master:d86f0526: cmake: Rename macos.cmake to darwin
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: d86f05261c386f4147bb4177b80673ae4c0f45d3 URL: https://github.com/kamailio/kamailio/commit/d86f05261c386f4147bb4177b80673a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:19:58Z cmake: Rename macos.cmake to darwin --- Added: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/d86f05261c386f4147bb4177b80673a… Patch: https://github.com/kamailio/kamailio/commit/d86f05261c386f4147bb4177b80673a… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake new file mode 100644 index 00000000000..9fcc61f628d --- /dev/null +++ b/cmake/os-specific/darwin.cmake @@ -0,0 +1,41 @@ +message( + STATUS + "Configuring for Darwin (Apple stationary operating systems (macOS, OS X, etc.)" +) + +target_compile_definitions( + common + INTERFACE HAVE_SOCKADDR_SA_LEN + HAVE_GETHOSTBYNAME2 + HAVE_UNION_SEMUN + HAVE_SCHED_YIELD + USE_ANON_MMAP + NDEBUG # NDEBUG used to turn off assert (assert wants to call + # eprintf which doesn't seem to be defined in any shared lib + HAVE_CONNECT_ECONNRESET_BUG + HAVE_TIMEGM + USE_SIGWAIT + HAVE_IP_MREQN +) + +target_link_libraries(common INTERFACE resolv) + +message(STATUS "USE_FAST_LOCK = ${USE_FAST_LOCK}") +if(NOT ${USE_FAST_LOCK}) + target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) +endif() + +set(CMAKE_MODULE_LINKER_FLAGS + "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress" +) +set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" +) + +if(NOT DEFINED ${NO_SELECT}) + target_compile_definitions(common INTERFACE HAVE_SELECT) +endif() + +if(NOT DEFINED ${NO_KQUEUE}) + target_compile_definitions(common INTERFACE HAVE_KQUEUE) +endif()

1 0

git:master:abb0448c: cmake: Add support for custom binary and cfg name
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: abb0448c11812d9f11529a70303348474eed19de URL: https://github.com/kamailio/kamailio/commit/abb0448c11812d9f11529a703033484… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:14:56Z cmake: Add support for custom binary and cfg name --- Modified: CMakeLists.txt Modified: src/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/abb0448c11812d9f11529a703033484… Patch: https://github.com/kamailio/kamailio/commit/abb0448c11812d9f11529a703033484… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 55923560477..f7270f0abc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,9 +27,15 @@ set(CMAKE_C_STANDARD_REQUIRED True) # Main project name # ----------------------- # main binary name -set(MAIN_NAME "kamailio") +set(MAIN_NAME + "kamailio" + CACHE STRING "Main binary name" +) # use kamailio config -set(CFG_NAME "kamailio") +set(CFG_NAME + "kamailio" + CACHE STRING "Config name" +) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d236ff9200..ccafefaefb2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,7 +100,9 @@ add_dependencies(kamailio GenerateParser) # Enable ENABLE_EXPORTS property so modules can link from symbols found in # main.c and core/*. -set_target_properties(kamailio PROPERTIES ENABLE_EXPORTS TRUE) +set_target_properties( + kamailio PROPERTIES ENABLE_EXPORTS TRUE OUTPUT_NAME ${MAIN_NAME} +) # Add the MODS_DIR definition required by main.c --- target_compile_definitions( @@ -117,25 +119,26 @@ install( COMPONENT kamailio-core ) -# Install the configuration file (kamailio.cfg) using a CODE block to check +# Install the configuration file (kamailio.cfg) ${CFG_NAME} using a CODE block to check # existence at install time instead of configure time # If(EXISTS ..) require full path install( CODE " - if(EXISTS \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/kamailio.cfg\") - message(STATUS \"kamailio.cfg already exists in \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/kamailio.cfg. Installing as kamailio.cfg.sample\") + if(EXISTS \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/${CFG_NAME}.cfg\") + message(STATUS \"${CFG_NAME} already exists in \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}/${CFG_NAME}. Installing as ${CFG_NAME}.sample\") file(INSTALL \"${CMAKE_SOURCE_DIR}/etc/kamailio.cfg\" DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}\" - RENAME \"kamailio.cfg.sample\" + RENAME \"${CFG_NAME}.cfg.sample\" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) else() file(INSTALL \"${CMAKE_SOURCE_DIR}/etc/kamailio.cfg\" DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}\" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + RENAME \"${CFG_NAME}.cfg\" ) endif() " - COMPONENT kamailio-cfg + COMPONENT kamailio-utils-cfg ) diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 3d3a7fe717f..1ba5087d407 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -6,9 +6,7 @@ project(kamailio_utils) # "${basedir}") endif() set(KAMCTL_TMP_DIR "${CMAKE_BINARY_DIR}/kamctltmp") -message( - STATUS "kamctltmpdir: ${KAMCTL_TMP_DIR} BINARY_DIR: ${CMAKE_BINARY_DIR}" -) +message(STATUS "Temporary kamctl.{db} files in : ${KAMCTL_TMP_DIR}") file(MAKE_DIRECTORY ${KAMCTL_TMP_DIR}) @@ -17,9 +15,8 @@ set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SBINDIR}") set(LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${MAIN_NAME}/kamctl" ) -set(CFG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/kamailio") +set(CFG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/${MAIN_NAME}") set(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}") -message(STATUS "BIN_DIR: ${BIN_DIR} LIB_DIR: ${LIB_DIR} CFG_DIR: ${CFG_DIR}") # Install kamctl add_custom_command(

1 0

git:master:394cc191: cmake: Refines uninstall script and updates CMake options
by Xenofon Karamanos 03 Dec '24

03 Dec '24

Module: kamailio Branch: master Commit: 394cc191e172f49525c91e3540eb590edf8bd101 URL: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-03T15:14:15Z cmake: Refines uninstall script and updates CMake options - Modifies uninstall logic removing duplicate file entries when both .cfg and .cfg sample are installed - Remove unused SCTP and duplicate fast memory statistics options in CMake --- Modified: cmake/cmake_uninstall.cmake.in Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… Patch: https://github.com/kamailio/kamailio/commit/394cc191e172f49525c91e3540eb590… --- diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 333534f3068..1087faf024e 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -6,10 +6,12 @@ if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") endif() file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) -list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/kamailio/kamailio.cfg") -list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/kamailio/kamctlrc") - string(REGEX REPLACE "\n" ";" files "${files}") + +list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/@MAIN_NAME@/@CFG_NAME@.cfg") +list(APPEND files "@CMAKE_INSTALL_PREFIX@/etc/@MAIN_NAME@/kamctlrc") +list(REMOVE_DUPLICATES files) + foreach(file ${files}) message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") @@ -26,7 +28,7 @@ foreach(file ${files}) if(NOT "${rm_retval}" STREQUAL 0) message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") endif() - else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + else() message(STATUS "File $ENV{DESTDIR}${file} does not exist.") endif() endforeach() diff --git a/cmake/defs.cmake b/cmake/defs.cmake index c3a338ec5ea..10940d2030c 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -45,7 +45,6 @@ endif() option(KMSTATS "Kamailio statistics" ON) option(FMSTATS "Fast memory statistics" ON) option(WITHAS "With Application server support" ON) -option(SCTP "SCTP support" ON) option(RAW_SOCKS "Raw sockets support" ON) option(MEMPKG "Package memory or sys " ON) @@ -80,7 +79,6 @@ option(USE_DST_BLOCKLIST "Use destination blacklist" ON) option(HAVE_RESOLV_RES "Have resolv_res" ON) option(KSR_PTHREAD_MUTEX_SHARED "Use shared mutex for TLS" ON) -option(FMSTATS "Fast memory statistics" ON) option(STATISTICS "Statistics" ON) # if(${MEMPKG}) target_compile_definitions(common INTERFACE PKG_MALLOC) else() # if(${MEMDBGSYS}) target_compile_definitions(common INTERFACE DDBG_SYS_MEMORY) @@ -271,8 +269,6 @@ if(NO_DEV_POLL) target_compile_definitions(common INTERFACE NO_DEV_POLL) endif() -# if(USE_SCTP) target_compile_definitions(common INTERFACE USE_SCTP) endif() - if(RAW_SOCKS) target_compile_definitions(common INTERFACE RAW_SOCKS) endif()

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024