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 <sebastian_ml@gmx.net>
This commit is contained in:
parent
867b79bf75
commit
a0549eab4a
2 changed files with 1 additions and 28 deletions
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=kamailio5
|
PKG_NAME:=kamailio5
|
||||||
PKG_VERSION:=5.2.1
|
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_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
|
||||||
PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
|
PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
|
||||||
|
|
|
@ -28,15 +28,6 @@
|
||||||
|
|
||||||
ifeq ($(HIREDIS_BUILDER),)
|
ifeq ($(HIREDIS_BUILDER),)
|
||||||
HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis
|
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
|
--- a/src/modules/ndb_redis/Makefile
|
||||||
+++ b/src/modules/ndb_redis/Makefile
|
+++ b/src/modules/ndb_redis/Makefile
|
||||||
@@ -5,12 +5,10 @@ include ../../Makefile.defs
|
@@ -5,12 +5,10 @@ include ../../Makefile.defs
|
||||||
|
@ -52,15 +43,6 @@
|
||||||
|
|
||||||
ifeq ($(HIREDIS_BUILDER),)
|
ifeq ($(HIREDIS_BUILDER),)
|
||||||
HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis
|
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
|
--- a/src/modules/topos_redis/Makefile
|
||||||
+++ b/src/modules/topos_redis/Makefile
|
+++ b/src/modules/topos_redis/Makefile
|
||||||
@@ -5,12 +5,10 @@ include ../../Makefile.defs
|
@@ -5,12 +5,10 @@ include ../../Makefile.defs
|
||||||
|
@ -76,12 +58,3 @@
|
||||||
|
|
||||||
ifeq ($(HIREDIS_BUILDER),)
|
ifeq ($(HIREDIS_BUILDER),)
|
||||||
HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis -I/usr/include/hiredis
|
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
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue