aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2019-08-13 12:04:04 +0200
committerRobby Workman <rworkman@slackbuilds.org>2021-04-17 23:14:16 -0500
commit2e536cadbe659a13c2225104d069823d1f5c1f67 (patch)
treea31978b39db8379b00c2a27c569d49785eeec9d2
parent290d7748cd05a415976086cf0df65df625d657ef (diff)
libraries/belle-sip: Patch for gcc >= 9.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/belle-sip/belle-sip.SlackBuild2
-rw-r--r--libraries/belle-sip/gcc9.patch19
2 files changed, 21 insertions, 0 deletions
diff --git a/libraries/belle-sip/belle-sip.SlackBuild b/libraries/belle-sip/belle-sip.SlackBuild
index 60a6869a5c8e..a823f815cd08 100644
--- a/libraries/belle-sip/belle-sip.SlackBuild
+++ b/libraries/belle-sip/belle-sip.SlackBuild
@@ -92,6 +92,8 @@ autoreconf -ivf
# Kill the accursed -Werror (fix for -current)
SLKCFLAGS="$SLKCFLAGS -Wno-error"
+patch -p1 < $CWD/gcc9.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CPPFLAGS="${CPPFLAGS} -I/usr/include/antlr3" \
diff --git a/libraries/belle-sip/gcc9.patch b/libraries/belle-sip/gcc9.patch
new file mode 100644
index 000000000000..35fa1ceae043
--- /dev/null
+++ b/libraries/belle-sip/gcc9.patch
@@ -0,0 +1,19 @@
+diff --git a/src/dns.h b/src/dns.h
+index ac390ae..33d99de 100644
+--- a/src/dns.h
++++ b/src/dns.h
+@@ -158,14 +158,6 @@ DNS_PUBLIC int *dns_debug_p(void);
+
+ #define dns_quietinit(...) \
+ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
+-#define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
+-#define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
+-#define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
+-
+-/* GCC parses the _Pragma operator less elegantly than clang. */
+-#define dns_quietinit(...) \
+- __extension__ ({ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__; DNS_PRAGMA_POP })
+ #else
+ #define DNS_PRAGMA_PUSH
+ #define DNS_PRAGMA_QUIET