From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Tue, 8 Sep 2020 17:26:42 +0000 (+0200)
Subject: freeswitch: add mod_rayo gcc 10 upstream fix
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=787ea81583fe7b9c1ec6eaa9339888d16b5dfe54;p=feed%2Ftelephony.git

freeswitch: add mod_rayo gcc 10 upstream fix

This removes the current workaround and replaces it with upstream fix.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/freeswitch/patches/410-mod_rayo_enable-f-no-common-compilation.patch b/net/freeswitch/patches/410-mod_rayo_enable-f-no-common-compilation.patch
new file mode 100644
index 0000000..0c4986e
--- /dev/null
+++ b/net/freeswitch/patches/410-mod_rayo_enable-f-no-common-compilation.patch
@@ -0,0 +1,20 @@
+commit 9c01bd4c78c678e989ac77522145d3bd46352f6f
+Author: Ciprian <ciprian.dosoftei@gmail.com>
+Date:   Tue Sep 1 12:13:28 2020 -0400
+
+    [mod_rayo] Enable -fno-common compilation
+
+diff --git a/src/mod/event_handlers/mod_rayo/iks_helpers.h b/src/mod/event_handlers/mod_rayo/iks_helpers.h
+index e221abe390..b98dbf5be6 100644
+--- a/src/mod/event_handlers/mod_rayo/iks_helpers.h
++++ b/src/mod/event_handlers/mod_rayo/iks_helpers.h
+@@ -51,8 +51,7 @@ struct xmpp_error {
+ 
+ #undef XMPP_ERROR
+ #define XMPP_ERROR(def_name, name, type) \
+-	SWITCH_DECLARE(const struct xmpp_error) def_name##_val; \
+-	SWITCH_DECLARE(const struct xmpp_error *) def_name;
++	extern const struct xmpp_error *def_name;
+ #include "xmpp_errors.def"
+ 
+ /* See RFC-3920 XMPP core for error definitions */
diff --git a/net/freeswitch/patches/410-rayo-gcc10.patch b/net/freeswitch/patches/410-rayo-gcc10.patch
deleted file mode 100644
index a9b9b98..0000000
--- a/net/freeswitch/patches/410-rayo-gcc10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/mod/event_handlers/mod_rayo/Makefile.am
-+++ b/src/mod/event_handlers/mod_rayo/Makefile.am
-@@ -8,7 +8,7 @@ IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la
- noinst_LTLIBRARIES = librayomod.la
- librayomod_la_SOURCES = mod_rayo.c iks_helpers.c nlsml.c rayo_components.c rayo_cpa_component.c rayo_cpa_detector.c rayo_elements.c rayo_fax_components.c
- librayomod_la_SOURCES += rayo_input_component.c rayo_output_component.c rayo_prompt_component.c rayo_record_component.c sasl.c srgs.c xmpp_streams.c rayo_exec_component.c
--librayomod_la_CFLAGS = $(AM_CFLAGS) -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS)
-+librayomod_la_CFLAGS = $(AM_CFLAGS) -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -fcommon
- 
- mod_LTLIBRARIES = mod_rayo.la
- mod_rayo_la_SOURCES  = 
-@@ -25,7 +25,7 @@ $(IKS_LA): $(IKS_BUILDDIR) $(IKS_DIR) $(
- noinst_PROGRAMS = test/test_iks test/test_nlsml test/test_srgs
- 
- test_test_iks_SOURCES = test/test_iks.c
--test_test_iks_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
-+test_test_iks_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_builddir)/libs/iksemel/include $(PCRE_CFLAGS) -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" -fcommon
- test_test_iks_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
- test_test_iks_LDADD = librayomod.la $(IKS_LA) $(PCRE_LIBS)
-