components/sysutils/net-snmp/patches/011.Makefile.in.patch

   1 --- net-snmp-5.4.1.2/agent/helpers/Makefile.in.~1~      2007-06-27 01:45:20.000000000 +0400
   2 +++ net-snmp-5.4.1.2/agent/helpers/Makefile.in  2013-10-18 11:26:56.731375183 +0400
   3 @@ -137,8 +137,11 @@
   4         table_tdata.lo \
   5         watcher.lo
   6
   7 +LIB_LD_ADD     =-lnetsnmp
   8 +LIB_LD_ADD_PATH        =-L../../snmplib
   9 +
  10  all: standardall
  11
  12  libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
  13 -       $(LIB_LD_CMD) $@ $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS)
  14 -       $(RANLIB) $@
  15 +       $(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) $(AGENTLIB) $(NETSNMPLIB) $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD)
  16 +       $(RANLIB) $@ $(LIB_LD_ADD)
  17 --- net-snmp-5.4.1.2/snmplib/Makefile.in.~1~    2007-06-19 01:34:43.000000000 +0400
  18 +++ net-snmp-5.4.1.2/snmplib/Makefile.in        2013-10-18 11:17:52.359731717 +0400
  19 @@ -181,6 +181,9 @@
  20  # just in case someone wants to remove libtool, change this to OBJS.
  21  TOBJS=$(LOBJS)
  22
  23 +# To satisfy -zdefs
  24 +LIB_LD_ADD     =-lnsl -L$(libdir)
  25 +
  26  #
  27  CPPFLAGS = $(TOP_INCLUDES) -I.         $(SNMPLIB_INCLUDES) @CPPFLAGS@
  28
  29 @@ -188,8 +191,8 @@
  30
  31  # how to build the libraries.
  32  libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
  33 -       $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
  34 -       $(RANLIB) $@
  35 +       $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ $(LIB_LD_ADD)
  36 +       $(RANLIB) $@  $(LIB_LD_ADD)
  37
  38  libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
  39         $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
  40 --- net-snmp-5.4.1.2/agent/Makefile.in.~1~      2007-07-05 03:26:56.000000000 +0400
  41 +++ net-snmp-5.4.1.2/agent/Makefile.in  2013-10-18 11:18:56.667774963 +0400
  42 @@ -120,8 +120,11 @@
  43  OBJS           = $(LIBAGENTOBJS)  $(AGENTOBJS)  mib_modules.o  auto_nlist.o
  44  LOBJS          = $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo
  45
  46 +LIB_LD_ADD_AGENT       =-lnetsnmp -lnetsnmphelpers
  47 +
  48 +LIB_LD_ADD_PATH_MIBS   =-Lhelpers -L../snmplib
  49
  50 -all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
  51 +all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
  52
  53  #
  54  # build stuff targets
  55 @@ -152,6 +155,10 @@
  56
  57  agentlib: $(AGENTLIB)
  58
  59 +relinklib:     ${LLIBAGENTOBJS} $(USELIBS)
  60 +       $(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT)
  61 +       $(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT)
  62 +
  63  miblib: $(MIBLIB)
  64
  65  libs: $(INSTALLLIBS)