From a0549eab4a9694d53fbde18bcb826c108fea019b Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 13 Apr 2019 13:02:34 +0200 Subject: [PATCH] kamailio-5.x: update hiredis patch The libhiredis package now contais a fix for its pkgconfig file. This allows to add prefixes, which is needed when cross-compiling in environments like OpenWrt. Therefore, the workaround in kamailio is no longer needed and can be removed. Signed-off-by: Sebastian Kemper --- net/kamailio-5.x/Makefile | 2 +- .../patches/140-redis_use_pkg-config.patch | 27 ------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile index 0387cf4..c56b6eb 100644 --- a/net/kamailio-5.x/Makefile +++ b/net/kamailio-5.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio5 PKG_VERSION:=5.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz diff --git a/net/kamailio-5.x/patches/140-redis_use_pkg-config.patch b/net/kamailio-5.x/patches/140-redis_use_pkg-config.patch index a7922e7..86e7d7b 100644 --- a/net/kamailio-5.x/patches/140-redis_use_pkg-config.patch +++ b/net/kamailio-5.x/patches/140-redis_use_pkg-config.patch @@ -28,15 +28,6 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis -@@ -19,7 +17,7 @@ else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) - HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) - --ifeq (,$(findstring hiredis,$(HIREDISDEFS))) -+ifneq (,$(findstring hiredis,$(HIREDISDEFS))) - DEFS+=-DWITH_HIREDIS_PATH - endif - --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -5,12 +5,10 @@ include ../../Makefile.defs @@ -52,15 +43,6 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis -@@ -19,7 +17,7 @@ else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) - HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) - --ifeq (,$(findstring hiredis,$(HIREDISDEFS))) -+ifneq (,$(findstring hiredis,$(HIREDISDEFS))) - DEFS+=-DWITH_HIREDIS_PATH - endif - --- a/src/modules/topos_redis/Makefile +++ b/src/modules/topos_redis/Makefile @@ -5,12 +5,10 @@ include ../../Makefile.defs @@ -76,12 +58,3 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis -@@ -19,7 +17,7 @@ else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) - HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) - --ifeq (,$(findstring hiredis,$(HIREDISDEFS))) -+ifneq (,$(findstring hiredis,$(HIREDISDEFS))) - DEFS+=-DWITH_HIREDIS_PATH - endif - -- 2.30.2