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>

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 (file)
index 0000000..4e3001e
--- /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
similarity index 98%
rename from net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
rename to net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
index ff99cf4ad76193aa7031012ada67283cb6433fc4..b3a807cc5e2af168758124693b527c20cd3723a6 100644 (file)
--- 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