diff options
| author |   Matteo Bernardini | 2018-09-16 10:01:39 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2018-09-16 10:01:39 +0200 |
| commit | ca287d36b4725ff2cf67fa44cb810df5fec58360 (patch) | |
| tree | a2d7b1a2c920909c3a2331169d06edb2e4b65d7e /network/bwm-ng | |
| parent | 24e3944b74fb96d36bf7eb125a63330ce137a3aa (diff) | |
| download | slackbuilds-ca287d36b4725ff2cf67fa44cb810df5fec58360.tar.gz | |
20180916.1 global branch merge.current-20180916.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'network/bwm-ng')
| -rw-r--r-- | network/bwm-ng/bwm-ng.SlackBuild | 3 | ||||
| -rw-r--r-- | network/bwm-ng/fix_gcc7_inline.patch | 40 |
2 files changed, 43 insertions, 0 deletions
diff --git a/network/bwm-ng/bwm-ng.SlackBuild b/network/bwm-ng/bwm-ng.SlackBuild index 51a9ee8aba..69f668f7ee 100644 --- a/network/bwm-ng/bwm-ng.SlackBuild +++ b/network/bwm-ng/bwm-ng.SlackBuild @@ -70,6 +70,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks opensuse +patch -p0 < $CWD/fix_gcc7_inline.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/network/bwm-ng/fix_gcc7_inline.patch b/network/bwm-ng/fix_gcc7_inline.patch new file mode 100644 index 0000000000..dec44a7d66 --- /dev/null +++ b/network/bwm-ng/fix_gcc7_inline.patch @@ -0,0 +1,40 @@ +--- src/bwm-ng.c.orig 2017-06-12 03:15:08.731964116 +0200 ++++ src/bwm-ng.c 2017-06-12 03:15:21.492001798 +0200 +@@ -26,7 +26,7 @@ + + /* handle interrupt signal */ + void sigint(int sig) FUNCATTR_NORETURN; +-inline void init(void); ++static inline void init(void); + + /* clear stuff and exit */ + #ifdef __STDC__ +@@ -98,7 +98,7 @@ + deinit(0, NULL); + } + +-inline void init(void) { ++static inline void init(void) { + if_count=0; + delay=500; + #if EXTENDED_STATS +--- src/options.c.orig 2017-06-12 03:11:33.659353656 +0200 ++++ src/options.c 2017-06-12 03:14:36.535870677 +0200 +@@ -34,7 +34,7 @@ + #if EXTENDED_STATS + inline int str2output_type(char *optarg); + #endif +-inline int str2out_method(char *optarg); ++static inline int str2out_method(char *optarg); + inline int str2in_method(char *optarg); + + #ifdef CONFIG_FILE +@@ -87,7 +87,7 @@ + } + #endif + +-inline int str2out_method(char *optarg) { ++static inline int str2out_method(char *optarg) { + if (optarg) { + if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; + #ifdef HAVE_CURSES |