Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtpengine: clean up 01-cflags.patch

Browse source 
This commit follows upstream, how they include the Debian build system
flags, appending them to their own. To that end OpenWrt's flags are now
saved at the beginning of the Makefiles, and appended at the bottom of
lib/lib.Makefile.

This also sorts out the iptables module compile, to use OpenWrt's
LDFLAGS.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2020-05-21 17:34:48 +02:00
parent c7cef81e63
commit aa54d6f005
1 changed files with 47 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
net/rtpengine/patches/01-cflags.patch
View file

@ -1,41 +1,55 @@
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -51,7 +51,7 @@ endif
endif
endif
-CFLAGS= -g -Wall -Wstrict-prototypes -pthread -fno-strict-aliasing
+CFLAGS+= -g -Wall -Wstrict-prototypes -pthread -fno-strict-aliasing
CFLAGS+= -std=c99
CFLAGS+= $(shell pkg-config --cflags glib-2.0)
CFLAGS+= $(shell pkg-config --cflags gthread-2.0)
--- a/lib/lib.Makefile --- a/lib/lib.Makefile
+++ b/lib/lib.Makefile +++ b/lib/lib.Makefile
@@ -47,8 +47,6 @@ endif @@ -62,3 +62,6 @@ ifneq ($(DBG),yes)
LDLIBS+= $(shell dpkg-buildflags --get LDLIBS)
ifeq ($(DBG),yes) endif
CFLAGS+= -D__DEBUG=1
-else
-CFLAGS+= -O3
endif endif
+
+CFLAGS+=$(OpenWrt_CFLAGS)
+LDFLAGS+=$(OpenWrt_LDFLAGS)
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -1,3 +1,6 @@
+OpenWrt_CFLAGS:=$(CFLAGS)
+OpenWrt_LDFLAGS:=$(LDFLAGS)
+
TARGET= rtpengine
with_iptables_option ?= yes
--- a/iptables-extension/Makefile
+++ b/iptables-extension/Makefile
@@ -1,5 +1,5 @@
CC?=gcc
-CFLAGS = -O2 -Wall -Wstrict-prototypes -shared -fPIC
+CFLAGS += -Wall -Wstrict-prototypes -shared -fPIC
ifneq ($(RTPENGINE_VERSION),)
CFLAGS += -DRTPENGINE_VERSION="\"$(RTPENGINE_VERSION)\""
else
--- a/recording-daemon/Makefile --- a/recording-daemon/Makefile
+++ b/recording-daemon/Makefile +++ b/recording-daemon/Makefile
@@ -1,6 +1,6 @@ @@ -1,3 +1,6 @@
+OpenWrt_CFLAGS:=$(CFLAGS)
+OpenWrt_LDFLAGS:=$(LDFLAGS)
+
TARGET= rtpengine-recording TARGET= rtpengine-recording
-CFLAGS= -g -Wall -Wstrict-prototypes -pthread -I. -I../lib/ -I../kernel-module/ CFLAGS= -g -Wall -Wstrict-prototypes -pthread -I. -I../lib/ -I../kernel-module/
+CFLAGS+= -g -Wall -Wstrict-prototypes -pthread -I. -I../lib/ -I../kernel-module/ --- a/iptables-extension/Makefile
CFLAGS+= -std=c99 -fno-strict-aliasing +++ b/iptables-extension/Makefile
CFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE @@ -1,3 +1,6 @@
CFLAGS+= $(shell pkg-config --cflags glib-2.0) +OpenWrt_CFLAGS:=$(CFLAGS)
+OpenWrt_LDFLAGS:=$(LDFLAGS)
+
CC?=gcc
CFLAGS = -O2 -Wall -Wstrict-prototypes -shared -fPIC
ifneq ($(RTPENGINE_VERSION),)
@@ -22,6 +25,9 @@ else
XTABLES = $(shell test -e /usr/include/xtables.h && echo 1)
endif
+CFLAGS+=$(OpenWrt_CFLAGS)
+LDFLAGS+=$(OpenWrt_LDFLAGS)
+
IPTABLES = $(shell test -e /usr/include/iptables.h && echo 1)
IP6TABLES = $(shell test -e /usr/include/ip6tables.h && echo 1)
@@ -37,7 +43,7 @@ WORK=1
module: libxt_RTPENGINE.so
libxt_RTPENGINE.so: libxt_RTPENGINE.c
- $(CC) $(CFLAGS) -o libxt_RTPENGINE.so libxt_RTPENGINE.c
+ $(CC) $(LDFLAGS) $(CFLAGS) -o libxt_RTPENGINE.so libxt_RTPENGINE.c
else