diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2020-02-13 11:08:45 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2020-02-13 11:13:37 +0100 |
| commit | 6cd511fdaadd068af8ce0b2872450d02c6a63364 (patch) | |
| tree | aafea6a111d08b288af5b42f743f3b532c877eb0 /net-analyzer | |
| parent | sys-devel/gcc-config: s390 stable wrt bug #709432 (diff) | |
| download | gentoo-6cd511fdaadd068af8ce0b2872450d02c6a63364.tar.gz gentoo-6cd511fdaadd068af8ce0b2872450d02c6a63364.tar.bz2 gentoo-6cd511fdaadd068af8ce0b2872450d02c6a63364.zip | |
net-analyzer/mbrowse: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=709402
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch | 16 | ||||
| -rw-r--r-- | net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch | 29 | ||||
| -rw-r--r-- | net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild | 9 |
3 files changed, 50 insertions, 4 deletions
diff --git a/net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch b/net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch new file mode 100644 index 000000000000..f17904b66901 --- /dev/null +++ b/net-analyzer/mbrowse/files/mbrowse-0.4.3-flags.patch @@ -0,0 +1,16 @@ +--- acinclude.m4 ++++ b/acinclude.m4 +@@ -277,13 +277,11 @@ + echo "*** --with-snmp-lib=DIR" + echo "***" + CFLAGS="$ac_save_CFLAGS" +- LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" + ifelse([$3], ,:,[$3]) + fi + + CFLAGS="$ac_save_CFLAGS" +- LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" + + AC_SUBST(SNMP_CFLAGS) diff --git a/net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch b/net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch new file mode 100644 index 000000000000..72a4c785a13c --- /dev/null +++ b/net-analyzer/mbrowse/files/mbrowse-0.4.3-fno-common.patch @@ -0,0 +1,29 @@ +--- a/src/interface.h ++++ b/src/interface.h +@@ -9,12 +9,14 @@ + GtkAccelGroup *accels; + } main_widgets_t; + +-struct menu_items { ++typedef struct menu_items { + char *item; + GtkSignalFunc func; + gpointer data; + GtkWidget *mi; +-}; ++} menu_items; ++ ++extern struct menu_items bookmark_items[128]; + + void set_hostname(const char *host); + void set_oid(const char *oid); +--- a/src/bookmarks.c ++++ b/src/bookmarks.c +@@ -27,7 +27,6 @@ + static GtkWidget *bkdial; + int delete = 0; + +-struct menu_items bookmark_items[128]; + static GtkWidget* create_bookmark_dialogue(void); + + static void mark_for_delete(void) { diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild index 703e99ef3ccb..ab930a39ba20 100644 --- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild +++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,12 +21,13 @@ DEPEND=" RDEPEND="${DEPEND}" DOCS=( AUTHORS README ChangeLog ) +PATCHES=( + "${FILESDIR}"/${PN}-0.4.3-flags.patch + "${FILESDIR}"/${PN}-0.4.3-fno-common.patch +) src_prepare() { default - sed -i \ - -e '/LDFLAGS=/d' \ - acinclude.m4 || die eautoreconf } |