[packages/net-snmp.git] / net-snmp-link.patch

--- net-snmp-5.9/agent/Makefile.in.orig	2020-08-14 23:41:47.000000000 +0200
+++ net-snmp-5.9/agent/Makefile.in	2020-10-04 16:24:10.739288016 +0200
@@ -111,7 +111,7 @@
 #
 # how to build it info
 #
-USELIBS		= ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+USELIBS		= $(top_builddir)/snmplib/libnetsnmp.la
 AGENTLIB	= libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
 MIBLIB		= libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
 
@@ -300,11 +300,11 @@
 	$(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS}
 
 libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} $(USELIBS)
-	$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
+	$(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
 	$(RANLIB) $(AGENTLIB)
 
 libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
-	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
+	$(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
 	$(RANLIB) $(MIBLIB)
 
 agentlib: $(AGENTLIB)
--- net-snmp-5.4.1/Makefile.rules.orig	2007-07-07 01:39:10.000000000 +0200
+++ net-snmp-5.4.1/Makefile.rules	2007-09-08 16:43:38.055836050 +0200
@@ -8,7 +8,7 @@
 
 # the standard items to build: libraries, bins, and sbins
 STANDARDTARGETS     =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
-STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
+STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
 
 standardall: subdirs $(STANDARDTARGETS)
 
@@ -187,17 +187,11 @@
 		$(LIB_LDCONFIG_CMD) ; \
 	fi
 
-installucdlibs: $(INSTALLUCDLIBS)
-	@if test "$(INSTALLUCDLIBS)" != ""; then \
-		it="$(INSTALLUCDLIBS)" ; \
-		$(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
-		$(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \
-		for i in $$it ; do \
-			echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \
-			$(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \
-		done ; \
-		$(LIB_LDCONFIG_CMD) ; \
-	fi
+installucdlibs:
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
+	ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \
+	ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \
+	ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a
 
 installsubdirlibs:
 	@if test "$(SUBDIRS)" != ""; then \
--- net-snmp-5.6/snmplib/Makefile.in.orig	2010-05-27 06:06:32.000000000 +0200
+++ net-snmp-5.6/snmplib/Makefile.in	2010-10-24 10:35:59.615743558 +0200
@@ -134,7 +134,6 @@
 
 # libraries
 INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
 
 #
 # Things to build
@@ -200,11 +199,7 @@
 
 # how to build the libraries.
 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
-	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
-	$(RANLIB) $@
-
-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
-	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
+	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
 	$(RANLIB) $@
 
 #
Commit	Line	Data
fd175359 JB	1	--- net-snmp-5.9/agent/Makefile.in.orig 2020-08-14 23:41:47.000000000 +0200
	2	+++ net-snmp-5.9/agent/Makefile.in 2020-10-04 16:24:10.739288016 +0200
	3	@@ -111,7 +111,7 @@
f548e789 AM	4	#
	5	# how to build it info
	6	#
	7	-USELIBS = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
f548e789	8	+USELIBS = $(top_builddir)/snmplib/libnetsnmp.la
13da4243 JB	9	AGENTLIB = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
13da4243 JB	10	MIBLIB = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
40bc0036	11
fd175359 JB	12	@@ -300,11 +300,11 @@
fd175359 JB	13	$(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS}
edf6eebd	14
13da4243	15	libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
fd175359 JB	16	- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
fd175359 JB	17	+ $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
13da4243	18	$(RANLIB) $(AGENTLIB)
bf8b8ba8	19
afbe2a1a	20	libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
fd175359 JB	21	- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
fd175359 JB	22	+ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@
13da4243 JB	23	$(RANLIB) $(MIBLIB)
	24
	25	agentlib: $(AGENTLIB)
	26	--- net-snmp-5.4.1/Makefile.rules.orig 2007-07-07 01:39:10.000000000 +0200
	27	+++ net-snmp-5.4.1/Makefile.rules 2007-09-08 16:43:38.055836050 +0200
40bc0036 JB	28	@@ -8,7 +8,7 @@
	29
	30	# the standard items to build: libraries, bins, and sbins
	31	STANDARDTARGETS =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
13da4243 JB	32	-STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
13da4243 JB	33	+STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
40bc0036 JB	34
	35	standardall: subdirs $(STANDARDTARGETS)
	36
13da4243	37	@@ -187,17 +187,11 @@
40bc0036 JB	38	$(LIB_LDCONFIG_CMD) ; \
	39	fi
	40
	41	-installucdlibs: $(INSTALLUCDLIBS)
	42	- @if test "$(INSTALLUCDLIBS)" != ""; then \
	43	- it="$(INSTALLUCDLIBS)" ; \
	44	- $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
834a380a	45	- $(INSTALL) $(INSTALLUCDLIBS) $(INSTALL_PREFIX)$(libdir) ; \
	46	- for i in $$it ; do \
	47	- echo "installing $$i in $(INSTALL_PREFIX)$(libdir)"; \
	48	- $(RANLIB) $(INSTALL_PREFIX)$(libdir)/$$i ; \
	49	- done ; \
40bc0036 JB	50	- $(LIB_LDCONFIG_CMD) ; \
	51	- fi
	52	+installucdlibs:
	53	+ $(SHELL) $(top_srcdir)/mkinstalldirs $(INSTALL_PREFIX)$(libdir) ; \
	54	+ ln -sf libnetsnmp.so $(INSTALL_PREFIX)$(libdir)/libsnmp.so ; \
	55	+ ln -sf libnetsnmp.la $(INSTALL_PREFIX)$(libdir)/libsnmp.la ; \
	56	+ ln -sf libnetsnmp.a $(INSTALL_PREFIX)$(libdir)/libsnmp.a
	57
	58	installsubdirlibs:
	59	@if test "$(SUBDIRS)" != ""; then \
afbe2a1a JB	60	--- net-snmp-5.6/snmplib/Makefile.in.orig 2010-05-27 06:06:32.000000000 +0200
	61	+++ net-snmp-5.6/snmplib/Makefile.in 2010-10-24 10:35:59.615743558 +0200
	62	@@ -134,7 +134,6 @@
40bc0036	63
04ea07b9 AM	64	# libraries
	65	INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
	66	-INSTALLUCDLIBS=libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
40bc0036	67
04ea07b9 AM	68	#
04ea07b9 AM	69	# Things to build
afbe2a1a	70	@@ -200,11 +199,7 @@
c05d0e2e AM	71
	72	# how to build the libraries.
	73	libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
afbe2a1a JB	74	- $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
	75	- $(RANLIB) $@
	76	-
	77	-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS)
	78	- $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
	79	+ $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
c05d0e2e AM	80	$(RANLIB) $@
	81
	82	#