diff options
Diffstat (limited to 'net/kamailio/files')
| -rw-r--r-- | net/kamailio/files/extra-patch-atomic-amd64 | 11 | ||||
| -rw-r--r-- | net/kamailio/files/extra-patch-atomic-i386 | 11 | ||||
| -rw-r--r-- | net/kamailio/files/patch-src_Makefile.defs | 21 |
3 files changed, 3 insertions, 40 deletions
diff --git a/net/kamailio/files/extra-patch-atomic-amd64 b/net/kamailio/files/extra-patch-atomic-amd64 deleted file mode 100644 index 9d97d1612e3d..000000000000 --- a/net/kamailio/files/extra-patch-atomic-amd64 +++ /dev/null @@ -1,11 +0,0 @@ ---- atomic/atomic_native.h.orig 2015-09-06 19:01:51 UTC -+++ atomic/atomic_native.h -@@ -46,6 +46,8 @@ - #ifndef __atomic_native - #define __atomic_native - -+#define CC_GCC_LIKE_ASM 1 -+#define __CPU_x86_64 1 - #ifdef CC_GCC_LIKE_ASM - - #if defined __CPU_i386 || defined __CPU_x86_64 diff --git a/net/kamailio/files/extra-patch-atomic-i386 b/net/kamailio/files/extra-patch-atomic-i386 deleted file mode 100644 index 89a9f8726bc3..000000000000 --- a/net/kamailio/files/extra-patch-atomic-i386 +++ /dev/null @@ -1,11 +0,0 @@ ---- atomic/atomic_native.h.orig 2015-09-06 19:01:51 UTC -+++ atomic/atomic_native.h -@@ -46,6 +46,8 @@ - #ifndef __atomic_native - #define __atomic_native - -+#define CC_GCC_LIKE_ASM 1 -+#define __CPU_i386 1 - #ifdef CC_GCC_LIKE_ASM - - #if defined __CPU_i386 || defined __CPU_x86_64 diff --git a/net/kamailio/files/patch-src_Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs index 32033cd14e4f..f67638f63b3a 100644 --- a/net/kamailio/files/patch-src_Makefile.defs +++ b/net/kamailio/files/patch-src_Makefile.defs @@ -1,4 +1,4 @@ ---- src/Makefile.defs.orig 2020-07-29 10:22:39 UTC +--- src/Makefile.defs.orig 2020-09-01 08:11:08 UTC +++ src/Makefile.defs @@ -257,7 +257,7 @@ YACC := $(shell echo "$${YACC}") @@ -16,9 +16,9 @@ - CC_NAME=gcc + CC_NAME=clang RPAREN=) - CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ + CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\ sed -e 's/([^$(RPAREN)]*)//g' \ -@@ -456,7 +456,7 @@ LIBDIR ?= +@@ -458,7 +458,7 @@ LIBDIR ?= ifeq ($(LIBDIR),) ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') ifeq ($(ARCHBSZ),64b) @@ -27,18 +27,3 @@ else LIBDIR = lib endif -@@ -1979,12 +1979,11 @@ ifeq ($(OS), freebsd) - ifeq ($(RAW_SOCKS), yes) - C_DEFS+= -DUSE_RAW_SOCKS - endif -+ LIBS= -lm # resolv and dlopen is in libc - ifneq ($(found_lock_method), yes) - C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems - found_lock_method=yes -- LIBS+= -pthread #dlopen is in libc -- else -- LIBS= #dlopen is in libc -+ LIBS+= -pthread - endif - # check for ver >= 4.1 - ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) |