components/net-snmp/patches/011.Makefile.in.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Fri, 02 May 2014 12:23:29 +0200
branchs11u1-sru
changeset 3109 1940d0927363
parent 252 ee0fb1eabcbf
child 1301 636f7c363f41
permissions -rw-r--r--
17758422 50 or more exec options in snmpd.conf results in errors

Only in net-snmp-5.4.1.mod: .patches.011.Makefile.in.patch
diff -ru net-snmp-5.4.1/agent/Makefile.in net-snmp-5.4.1.mod/agent/Makefile.in
--- net-snmp-5.4.1/agent/Makefile.in	2007-07-05 04:56:56.000000000 +0530
+++ net-snmp-5.4.1.mod/agent/Makefile.in	2009-06-24 06:08:28.858891018 +0530
@@ -120,8 +120,11 @@
 OBJS		= $(LIBAGENTOBJS)  $(AGENTOBJS)  mib_modules.o  auto_nlist.o
 LOBJS		= $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo
 
+LIB_LD_ADD_AGENT	=-lnetsnmp -lnetsnmphelpers
+ 
+LIB_LD_ADD_PATH_MIBS	=-Lhelpers -L../snmplib
 
-all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
+all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
 
 #
 # build stuff targets
@@ -152,6 +155,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: $(INSTALLLIBS)
Only in net-snmp-5.4.1.mod/agent: Makefile.in~
diff -ru net-snmp-5.4.1/agent/helpers/Makefile.in net-snmp-5.4.1.mod/agent/helpers/Makefile.in
--- net-snmp-5.4.1/agent/helpers/Makefile.in	2007-06-27 03:15:20.000000000 +0530
+++ net-snmp-5.4.1.mod/agent/helpers/Makefile.in	2009-06-24 06:01:35.912702710 +0530
@@ -137,8 +137,11 @@
 	table_tdata.lo \
 	watcher.lo
 
+LIB_LD_ADD	=-lnetsnmp
+LIB_LD_ADD_PATH	=-L../../snmplib
+
 all: standardall
 
 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
-	$(LIB_LD_CMD) $@ $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS)
-	$(RANLIB) $@
+	$(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD)
+	$(RANLIB) $@ $(LIB_LD_ADD)
diff -ru net-snmp-5.4.1/snmplib/Makefile.in net-snmp-5.4.1.mod/snmplib/Makefile.in
--- net-snmp-5.4.1/snmplib/Makefile.in	2007-06-19 03:04:43.000000000 +0530
+++ net-snmp-5.4.1.mod/snmplib/Makefile.in	2009-06-24 06:01:35.912972597 +0530
@@ -181,6 +181,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)
+
 # 
 CPPFLAGS = $(TOP_INCLUDES) -I. 	$(SNMPLIB_INCLUDES) @CPPFLAGS@
 
@@ -188,8 +191,8 @@
 
 # how to build the libraries.
 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
-	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
-	$(RANLIB) $@
+	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ } $(LIB_LD_ADD)
+	$(RANLIB) $@  $(LIB_LD_ADD)
 
 libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
 	$(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@