summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-09-10 09:34:48 +0200
committerJeroen Roovers <jer@gentoo.org>2019-09-10 09:35:08 +0200
commit1dcbc73fd4041c63775fa227e3ba9e92d3a16b61 (patch)
tree24d45da008e51bb5fc91ad14af22940b21560b43
parentdev-tcltk/tkdnd: x86 stable wrt bug #693898 (diff)
downloadgentoo-1dcbc73fd4041c63775fa227e3ba9e92d3a16b61.tar.gz
gentoo-1dcbc73fd4041c63775fa227e3ba9e92d3a16b61.tar.bz2
gentoo-1dcbc73fd4041c63775fa227e3ba9e92d3a16b61.zip
net-analyzer/net-snmp: Fix `net-snmp-config --libs`
Package-Manager: Portage-2.3.75, Repoman-2.3.17 Bug: https://bugs.gentoo.org/693970 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
-rw-r--r--net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch34
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild (renamed from net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild)1
2 files changed, 35 insertions, 0 deletions
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
new file mode 100644
index 000000000000..4e3001e1e473
--- /dev/null
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
@@ -0,0 +1,34 @@
+--- a/net-snmp-config.in
++++ b/net-snmp-config.in
+@@ -190,13 +190,13 @@
+ #################################################### client lib
+ --libs)
+ # use this one == --netsnmp-libs + --external-libs
+- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
++ echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
+ ;;
+ --netsnmp-libs)
+ echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
+ ;;
+ --external-libs)
+- echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
++ echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
+ ;;
+ #################################################### agent lib
+ --base-agent-libs)
+@@ -207,13 +207,13 @@
+ ;;
+ --agent-libs)
+ # use this one == --netsnmp-agent-libs + --external-libs
+- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
++ echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
+ ;;
+ --netsnmp-agent-libs)
+ echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
+ ;;
+ --external-agent-libs)
+- echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
++ echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
+ ;;
+ ####################################################
+ --version|--ver*)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
index ff99cf4ad761..b3a807cc5e2a 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
@@ -83,6 +83,7 @@ src_prepare() {
use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+ eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
eapply "${FILESDIR}"/${PN}-5.8-pcap.patch
eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch