diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-14 18:52:15 +0100 |
commit | d00821e77f72d4af4ea30158c1c6e18ffff0875b (patch) | |
tree | b28b6cb077ae6b2457e30d49028fc978d8e2b59b /net-analyzer/net-snmp/files | |
parent | 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (diff) | |
parent | 6a339b4f9ec107438bb71a6f9ca72fd42fbfd436 (diff) |
Merge branch 'next'
Diffstat (limited to 'net-analyzer/net-snmp/files')
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch | 34 | ||||
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch | 41 |
2 files changed, 75 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/files/net-snmp-5.8-pcap.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch new file mode 100644 index 000000000000..43692240acb6 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8-pcap.patch @@ -0,0 +1,41 @@ +--- a/configure.d/config_project_with_enable ++++ b/configure.d/config_project_with_enable +@@ -1187,6 +1187,11 @@ + [], + [with_bzip2="no"]) + ++AC_ARG_WITH([pcap], ++ [ --with-pcap[=DIR] use libpcap in DIR], ++ [], ++ [with_pcap="no"]) ++ + NETSNMP_ARG_WITH( + [mnttab], + AS_HELP_STRING( +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -583,14 +590,16 @@ + ## + # libpcap + ## +-NETSNMP_BUILD_PCAP_PROG_TRUE='#' +-NETSNMP_BUILD_PCAP_PROG_FALSE='' +-AC_CHECK_LIB([pcap], [pcap_create], [ +- AC_CHECK_HEADERS([pcap/pcap.h], [ +- NETSNMP_BUILD_PCAP_PROG_TRUE='' +- NETSNMP_BUILD_PCAP_PROG_FALSE='#' +- ]) +-]) ++if test "x$with_pcap" = "xyes" ; then ++ NETSNMP_BUILD_PCAP_PROG_TRUE='#' ++ NETSNMP_BUILD_PCAP_PROG_FALSE='' ++ AC_CHECK_LIB([pcap], [pcap_create], [ ++ AC_CHECK_HEADERS([pcap/pcap.h], [ ++ NETSNMP_BUILD_PCAP_PROG_TRUE='' ++ NETSNMP_BUILD_PCAP_PROG_FALSE='#' ++ ]) ++ ]) ++fi + AC_SUBST(NETSNMP_BUILD_PCAP_PROG_TRUE) + AC_SUBST(NETSNMP_BUILD_PCAP_PROG_FALSE) + |