1 Only in net-snmp-5.4.1.mod: .patches.011.Makefile.in.patch |
1 # |
2 diff -ru net-snmp-5.4.1/agent/Makefile.in net-snmp-5.4.1.mod/agent/Makefile.in |
2 # The Net-SNMP libraries are built without -zdefs and are missing a large |
3 --- net-snmp-5.4.1/agent/Makefile.in 2007-07-05 04:56:56.000000000 +0530 |
3 # number of dependency specifications (DT_NEEDED). This makes it |
4 +++ net-snmp-5.4.1.mod/agent/Makefile.in 2009-06-24 06:08:28.858891018 +0530 |
4 # impossible to build plugin modules against these libraries using |
5 @@ -120,8 +120,11 @@ |
5 # -zdefs, which should work. One such example is FMA in ON gate. |
6 OBJS = $(LIBAGENTOBJS) $(AGENTOBJS) mib_modules.o auto_nlist.o |
6 # |
|
7 --- net-snmp-5.7.2/agent/Makefile.in Tue Oct 9 15:28:58 2012 |
|
8 +++ net-snmp-5.7.2/agent/Makefile.in Sun Dec 30 23:58:44 2012 |
|
9 @@ -274,9 +274,13 @@ |
7 LOBJS = $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo |
10 LOBJS = $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo |
|
11 FTOBJS = $(LLIBAGENTFTS) $(FTAGENTOBJS) mib_modules.ft auto_nlist.ft |
8 |
12 |
9 +LIB_LD_ADD_AGENT =-lnetsnmp -lnetsnmphelpers |
13 +LIB_LD_ADD_AGENT =-lnetsnmp -lnetsnmphelpers |
10 + |
14 + |
11 +LIB_LD_ADD_PATH_MIBS =-Lhelpers -L../snmplib |
15 +LIB_LD_ADD_PATH_MIBS =-Lhelpers -L../snmplib |
|
16 + |
|
17 FEATUREFILE = $(top_builddir)/include/net-snmp/agent/features.h |
12 |
18 |
13 -all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) |
19 -all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) |
14 +all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) |
20 +all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) |
15 |
21 |
16 # |
22 # |
17 # build stuff targets |
23 # build stuff targets |
18 @@ -152,6 +155,10 @@ |
24 @@ -306,6 +310,10 @@ |
19 |
25 |
20 agentlib: $(AGENTLIB) |
26 agentlib: $(AGENTLIB) |
21 |
27 |
22 +relinklib: ${LLIBAGENTOBJS} $(USELIBS) |
28 +relinklib: ${LLIBAGENTOBJS} $(USELIBS) |
23 + $(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT) |
29 + $(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT) |
24 + $(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT) |
30 + $(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT) |
25 + |
31 + |
26 miblib: $(MIBLIB) |
32 miblib: $(MIBLIB) |
27 |
33 |
28 libs: $(INSTALLLIBS) |
34 libs: $(AGENTLIB) $(MIBLIB) |
29 Only in net-snmp-5.4.1.mod/agent: Makefile.in~ |
35 --- net-snmp-5.7.2/agent/helpers/Makefile.in Sun Dec 30 22:37:05 2012 |
30 diff -ru net-snmp-5.4.1/agent/helpers/Makefile.in net-snmp-5.4.1.mod/agent/helpers/Makefile.in |
36 +++ net-snmp-5.7.2/agent/helpers/Makefile.in Mon Dec 31 00:02:37 2012 |
31 --- net-snmp-5.4.1/agent/helpers/Makefile.in 2007-06-27 03:15:20.000000000 +0530 |
37 @@ -31,8 +31,11 @@ |
32 +++ net-snmp-5.4.1.mod/agent/helpers/Makefile.in 2009-06-24 06:01:35.912702710 +0530 |
38 |
33 @@ -137,8 +137,11 @@ |
39 LOBJS = dummy.lo |
34 table_tdata.lo \ |
|
35 watcher.lo |
|
36 |
40 |
37 +LIB_LD_ADD =-lnetsnmp |
41 +LIB_LD_ADD =-lnetsnmp |
38 +LIB_LD_ADD_PATH =-L../../snmplib |
42 +LIB_LD_ADD_PATH =-L../../snmplib |
39 + |
43 + |
40 all: standardall |
44 all: standardall |
41 |
45 |
42 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) |
46 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) |
43 - $(LIB_LD_CMD) $@ $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS) |
47 - $(LIB_LD_CMD) $@ $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS) |
44 - $(RANLIB) $@ |
48 - $(RANLIB) $@ |
45 + $(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD) |
49 + $(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD) |
46 + $(RANLIB) $@ $(LIB_LD_ADD) |
50 + $(RANLIB) $@ $(LIB_LD_ADD) |
47 diff -ru net-snmp-5.4.1/snmplib/Makefile.in net-snmp-5.4.1.mod/snmplib/Makefile.in |
51 --- net-snmp-5.7.2/snmplib/Makefile.in Sun Dec 30 22:37:08 2012 |
48 --- net-snmp-5.4.1/snmplib/Makefile.in 2007-06-19 03:04:43.000000000 +0530 |
52 +++ net-snmp-5.7.2/agent/helpers/Makefile.in Mon Dec 31 00:06:01 2012 |
49 +++ net-snmp-5.4.1.mod/snmplib/Makefile.in 2009-06-24 06:01:35.912972597 +0530 |
53 @@ -221,6 +221,9 @@ |
50 @@ -181,6 +181,9 @@ |
|
51 # just in case someone wants to remove libtool, change this to OBJS. |
54 # just in case someone wants to remove libtool, change this to OBJS. |
52 TOBJS=$(LOBJS) |
55 TOBJS=$(LOBJS) |
53 |
56 |
54 +# To satisfy -zdefs |
57 +# To satisfy -zdefs |
55 +LIB_LD_ADD =-lnsl -lsocket -L$(libdir) |
58 +LIB_LD_ADD =-lnsl -lsocket -L$(libdir) |
56 + |
59 + |
|
60 FEATUREFILE = $(top_builddir)/include/net-snmp/library/features.h |
|
61 |
57 # |
62 # |
58 CPPFLAGS = $(TOP_INCLUDES) -I. $(SNMPLIB_INCLUDES) @CPPFLAGS@ |
63 @@ -230,8 +233,8 @@ |
59 |
|
60 @@ -188,8 +191,8 @@ |
|
61 |
64 |
62 # how to build the libraries. |
65 # how to build the libraries. |
63 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) |
66 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) |
64 - $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ |
67 - $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ |
65 - $(RANLIB) $@ |
68 - $(RANLIB) $@ |
66 + $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ } $(LIB_LD_ADD) |
69 + $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ } $(LIB_LD_ADD) |
67 + $(RANLIB) $@ $(LIB_LD_ADD) |
70 + $(RANLIB) $@ $(LIB_LD_ADD) |
68 |
71 |
69 libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) |
72 libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) |
70 $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ |
73 $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ |