| 1 |
commit: 1dcbc73fd4041c63775fa227e3ba9e92d3a16b61 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 10 07:34:48 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 10 07:35:08 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcbc73f |
| 7 |
|
| 8 |
net-analyzer/net-snmp: Fix `net-snmp-config --libs` |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.75, Repoman-2.3.17 |
| 11 |
Bug: https://bugs.gentoo.org/693970 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
...snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch | 34 ++++++++++++++++++++++ |
| 15 |
...t-snmp-5.8-r3.ebuild => net-snmp-5.8-r4.ebuild} | 1 + |
| 16 |
2 files changed, 35 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..4e3001e1e47 |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch |
| 23 |
@@ -0,0 +1,34 @@ |
| 24 |
+--- a/net-snmp-config.in |
| 25 |
++++ b/net-snmp-config.in |
| 26 |
+@@ -190,13 +190,13 @@ |
| 27 |
+ #################################################### client lib |
| 28 |
+ --libs) |
| 29 |
+ # use this one == --netsnmp-libs + --external-libs |
| 30 |
+- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS |
| 31 |
++ echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS |
| 32 |
+ ;; |
| 33 |
+ --netsnmp-libs) |
| 34 |
+ echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS |
| 35 |
+ ;; |
| 36 |
+ --external-libs) |
| 37 |
+- echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ |
| 38 |
++ echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ |
| 39 |
+ ;; |
| 40 |
+ #################################################### agent lib |
| 41 |
+ --base-agent-libs) |
| 42 |
+@@ -207,13 +207,13 @@ |
| 43 |
+ ;; |
| 44 |
+ --agent-libs) |
| 45 |
+ # use this one == --netsnmp-agent-libs + --external-libs |
| 46 |
+- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS |
| 47 |
++ echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS |
| 48 |
+ ;; |
| 49 |
+ --netsnmp-agent-libs) |
| 50 |
+ echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS |
| 51 |
+ ;; |
| 52 |
+ --external-agent-libs) |
| 53 |
+- echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS |
| 54 |
++ echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS |
| 55 |
+ ;; |
| 56 |
+ #################################################### |
| 57 |
+ --version|--ver*) |
| 58 |
|
| 59 |
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild |
| 60 |
similarity index 98% |
| 61 |
rename from net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild |
| 62 |
rename to net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild |
| 63 |
index ff99cf4ad76..b3a807cc5e2 100644 |
| 64 |
--- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild |
| 65 |
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild |
| 66 |
@@ -83,6 +83,7 @@ src_prepare() { |
| 67 |
use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch |
| 68 |
|
| 69 |
eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch |
| 70 |
+ eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch |
| 71 |
eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch |
| 72 |
eapply "${FILESDIR}"/${PN}-5.8-pcap.patch |
| 73 |
eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch |
Archives