commit: 8559d859cb32840b379c99bf3d259b0ff3cc9230 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue May 2 18:53:29 2023 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Thu May 4 21:38:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8559d859
net-analyzer/net-snmp: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30842 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch | 34 -------------------- .../net-snmp-5.8.1-net-snmp-config-libdir.patch | 37 ---------------------- .../net-snmp/files/net-snmp-5.8.1-pkg-config.patch | 20 ------------ .../files/net-snmp-5.9.2-fix-LDFLAGS.patch | 18 ----------- .../net-snmp/files/net-snmp-99999999-tinfo.patch | 10 ------ 5 files changed, 119 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 deleted file mode 100644 index 4e3001e1e473..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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.1-net-snmp-config-libdir.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch deleted file mode 100644 index 73d420531bb3..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/net-snmp-config.in -+++ b/net-snmp-config.in -@@ -193,10 +193,10 @@ - #################################################### client lib - --libs) - # use this one == --netsnmp-libs + --external-libs -- echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS -+ echo $NSC_SNMPLIBS $NSC_LIBS - ;; - --netsnmp-libs) -- echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS -+ echo $NSC_BASE_SNMP_LIBS - ;; - --external-libs) - echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ -@@ -210,10 +210,10 @@ - ;; - --agent-libs) - # use this one == --netsnmp-agent-libs + --external-libs -- echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS -+ echo $NSC_AGENTLIBS $NSC_LIBS - ;; - --netsnmp-agent-libs) -- echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS -+ echo $NSC_BASE_AGENT_LIBS - ;; - --external-agent-libs) - echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS -@@ -660,7 +660,7 @@ - echo "Ack. Can't create $tmpfile." - exit 1 - fi -- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags" -+ cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $ldflags $NSC_LDFLAGS $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS" - echo "running: $cmd" - echo `$cmd` - result=$? diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch deleted file mode 100644 index acda136a22cd..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/netsnmp-agent.pc.in -+++ b/netsnmp-agent.pc.in -@@ -8,5 +8,5 @@ - URL: http://www.net-snmp.org - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp --Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ -+Libs: -lnetsnmpmibs -lnetsnmpagent -lnetsnmp -+Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ---- a/netsnmp.pc.in -+++ b/netsnmp.pc.in -@@ -8,5 +8,5 @@ - URL: http://www.net-snmp.org - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lnetsnmp --Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ -+Libs: -lnetsnmp -+Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch deleted file mode 100644 index 158d8f1b5bee..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.9.2-fix-LDFLAGS.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Makefile.top b/Makefile.top -index d6394ca..f5119b5 100644 ---- a/Makefile.top -+++ b/Makefile.top -@@ -86,11 +86,11 @@ LIBCURRENT = 41 - LIBAGE = 2 - LIBREVISION = 0 - --LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o -+LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o - LIB_EXTENSION = la - LIB_VERSION = - LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir) --LINK = $(LIBTOOL) --mode=link $(LINKCC) -+LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS) - # RANLIB = @RANLIB@ - RANLIB = : - diff --git a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch deleted file mode 100644 index 2eb4ccca6313..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -601,6 +601,7 @@ - [HAVE_LIBCURSES=FALSE],, - [LIBCURSES]) - AC_SUBST([HAVE_LIBCURSES]) -+NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,) - AC_SUBST([LIBCURSES]) - - # libm for ceil
