diff options
| author |   Matteo Bernardini | 2021-04-07 19:43:09 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2021-04-07 19:43:09 +0200 |
| commit | fc3c9447da6cded0b6741cf3e6c2386c16493440 (patch) | |
| tree | 4e2d3e3a7ba5c8cb879728d8e965da94d1fd4850 /libraries/belle-sip | |
| parent | a6bf666d73b4dccae0636e4ca04113d5953b956c (diff) | |
| download | slackbuilds-current-20210407.1.tar.gz | |
20210407.1 global branch merge.current-20210407.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/belle-sip')
| -rw-r--r-- | libraries/belle-sip/belle-sip.SlackBuild | 2 | ||||
| -rw-r--r-- | libraries/belle-sip/gcc9.patch | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libraries/belle-sip/belle-sip.SlackBuild b/libraries/belle-sip/belle-sip.SlackBuild index 60a6869a5c..a823f815cd 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 0000000000..35fa1ceae0 --- /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 |