diff options
| author | Sebastian Kemper | 2021-12-08 15:22:22 +0000 |
|---|---|---|
| committer | Sebastian Kemper | 2021-12-08 15:22:31 +0000 |
| commit | 8e687b90b778c4d768eb7892de27a6a8868bce65 (patch) | |
| tree | 482a83e92657105062e67ac54c90d141528a00ca | |
| parent | 1e49a312fa0f556a5c7101b0a7d6d7e2932a7ae6 (diff) | |
| download | telephony-8e687b90b778c4d768eb7892de27a6a8868bce65.tar.gz | |
baresip: drop 002-fix-rem-include.patch
Setting LIBREM_PATH allows dropping the patch.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
| -rw-r--r-- | net/baresip/Makefile | 1 | ||||
| -rw-r--r-- | net/baresip/patches/002-fix-rem-include.patch | 68 |
2 files changed, 1 insertions, 68 deletions
diff --git a/net/baresip/Makefile b/net/baresip/Makefile index 7cab4d8..f687913 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -127,6 +127,7 @@ MAKE_FLAGS+= \ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \ + LIBREM_PATH="$(STAGING_DIR)/usr" \ OS=linux \ RELEASE=1 \ SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ diff --git a/net/baresip/patches/002-fix-rem-include.patch b/net/baresip/patches/002-fix-rem-include.patch deleted file mode 100644 index 7556241..0000000 --- a/net/baresip/patches/002-fix-rem-include.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -45,63 +45,11 @@ SYSROOT_LOCAL := $(shell [ -d /usr/local - endif - endif - --ifndef LIBREM_PATH --LIBREM_PATH := $(shell [ -d ../rem ] && echo "../rem") --endif -- --ifeq ($(LIBREM_PATH),) --ifneq ($(SYSROOT_LOCAL),) --LIBREM_PATH := $(shell [ -f $(SYSROOT_LOCAL)/include/rem/rem.h ] && \ -- echo "$(SYSROOT_LOCAL)") --endif --endif -- --ifeq ($(LIBREM_PATH),) --LIBREM_PATH := $(shell [ -f $(SYSROOT)/include/rem/rem.h ] && \ -- echo "$(SYSROOT)") --endif -- - # Include path --LIBREM_INC := $(shell [ -f $(LIBREM_PATH)/include/rem.h ] && \ -- echo "$(LIBREM_PATH)/include") --ifeq ($(LIBREM_INC),) --LIBREM_INC := $(shell [ -f $(LIBREM_PATH)/include/rem/rem.h ] && \ -- echo "$(LIBREM_PATH)/include/rem") --endif --ifeq ($(LIBREM_INC),) --LIBREM_INC := $(shell [ -f /usr/local/include/rem/rem.h ] && \ -- echo "/usr/local/include/rem") --endif --ifeq ($(LIBREM_INC),) --LIBREM_INC := $(shell [ -f /usr/include/rem/rem.h ] && echo "/usr/include/rem") --endif -+LIBREM_INC := $(SYSROOT_ALT)/include/rem - - # Library path --ifeq ($(LIBREM_SO),) --LIBREM_SO := $(shell [ -f $(LIBREM_PATH)/librem.a ] && \ -- echo "$(LIBREM_PATH)") --endif --ifeq ($(LIBREM_SO),) --LIBREM_SO :=$(shell [ -f $(LIBREM_PATH)/librem$(LIB_SUFFIX) ] && \ -- echo "$(LIBREM_PATH)") --endif --ifeq ($(LIBREM_SO),) --LIBREM_SO := $(shell [ -f $(LIBREM_PATH)/lib/librem$(LIB_SUFFIX) ] && \ -- echo "$(LIBREM_PATH)/lib") --endif --ifeq ($(LIBREM_SO),) --LIBREM_SO := $(shell [ -f /usr/local/lib/librem$(LIB_SUFFIX) ] \ -- && echo "/usr/local/lib") --endif --ifeq ($(LIBREM_SO),) --LIBREM_SO := $(shell [ -f /usr/lib/librem$(LIB_SUFFIX) ] && \ -- echo "/usr/lib") --endif --ifeq ($(LIBREM_SO),) --LIBREM_SO := $(shell [ -f /usr/lib64/librem$(LIB_SUFFIX) ] && \ -- echo "/usr/lib64") --endif -- -+LIBREM_SO := $(SYSROOT_ALT)/include/rem - - CFLAGS += -I. -Iinclude -I$(LIBRE_INC) - CFLAGS += -I$(LIBREM_INC) |