components/net-snmp/patches/011.Makefile.in.patch
author gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
Tue, 14 May 2013 22:57:32 -0700
changeset 1301 636f7c363f41
parent 252 ee0fb1eabcbf
child 1306 11b376b53ac1
permissions -rw-r--r--
15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version

#
# The Net-SNMP libraries are built without -zdefs and are missing a large
# number of dependency specifications (DT_NEEDED).  This makes it
# impossible to build plugin modules against these libraries using
# -zdefs, which should work. One such example is FMA in ON gate. 
#
--- net-snmp-5.7.2/agent/Makefile.in	Tue Oct  9 15:28:58 2012
+++ net-snmp-5.7.2/agent/Makefile.in	Sun Dec 30 23:58:44 2012
@@ -274,9 +274,13 @@
 LOBJS		= $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo
 FTOBJS		= $(LLIBAGENTFTS) $(FTAGENTOBJS) mib_modules.ft auto_nlist.ft
 
+LIB_LD_ADD_AGENT   =-lnetsnmp -lnetsnmphelpers
+
+LIB_LD_ADD_PATH_MIBS   =-Lhelpers -L../snmplib
+
 FEATUREFILE     = $(top_builddir)/include/net-snmp/agent/features.h
 
-all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
+all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
 
 #
 # build stuff targets
@@ -306,6 +310,10 @@
 
 agentlib: $(AGENTLIB)
 
+relinklib:	${LLIBAGENTOBJS} $(USELIBS)
+	$(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT)
+	$(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT)
+
 miblib: $(MIBLIB)
 
 libs: $(AGENTLIB) $(MIBLIB)
--- net-snmp-5.7.2/agent/helpers/Makefile.in	Sun Dec 30 22:37:05 2012
+++ net-snmp-5.7.2/agent/helpers/Makefile.in	Mon Dec 31 00:02:37 2012
@@ -31,8 +31,11 @@
 
 LOBJS = dummy.lo
 
+LIB_LD_ADD	=-lnetsnmp
+LIB_LD_ADD_PATH	=-L../../snmplib
+
 all: standardall
 
 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
-	$(LIB_LD_CMD) $@ $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS)
-	$(RANLIB) $@
+	$(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD)
+	$(RANLIB) $@ $(LIB_LD_ADD)
--- net-snmp-5.7.2/snmplib/Makefile.in	Sun Dec 30 22:37:08 2012
+++ net-snmp-5.7.2/agent/helpers/Makefile.in	Mon Dec 31 00:06:01 2012
@@ -221,6 +221,9 @@
 # just in case someone wants to remove libtool, change this to OBJS.
 TOBJS=$(LOBJS)
 
+# To satisfy -zdefs
+LIB_LD_ADD =-lnsl -lsocket -L$(libdir)
+
 FEATUREFILE     = $(top_builddir)/include/net-snmp/library/features.h
 
 # 
@@ -230,8 +233,8 @@
 
 # how to build the libraries.
 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
-	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
-	$(RANLIB) $@
+	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ } $(LIB_LD_ADD)
+	$(RANLIB) $@ $(LIB_LD_ADD)
 
 libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
 	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@