ipv6/dibbler/patches/001-uclibcxx.patch

   1 diff -ruN dibbler-0.6.0-RC1-old/Makefile dibbler-0.6.0-RC1-new/Makefile
   2 --- dibbler-0.6.0-RC1-old/Makefile      2007-01-30 21:34:24.000000000 +0100
   3 +++ dibbler-0.6.0-RC1-new/Makefile      2007-09-01 04:55:38.000000000 +0200
   4 @@ -32,7 +32,7 @@
   5
   6  $(CLIENTBIN): libposlib includes commonlibs clntlibs $(MISC)/DHCPClient.o $(CLIENT)
   7         @echo "[LINK   ] $(SUBDIR)/$@ ($(LINKPRINT))"
   8 -       $(CXX) $(CLNT_LDFLAGS) $(OPTS) $(CLNTLINKOPTS) -o $@ $(MISC)/DHCPClient.o $(CLIENT) \
   9 +       $(CXXLD) $(CLNT_LDFLAGS) $(OPTS) $(CLNTLINKOPTS) -o $@ $(MISC)/DHCPClient.o $(CLIENT) \
  10         -L$(MISC)         -lMisc         \
  11         -L$(ADDRMGR)      -lAddrMgr      \
  12         -L$(CLNTADDRMGR)  -lClntAddrMgr  \
  13 @@ -50,7 +50,8 @@
  14         -L$(MESSAGES)     -lMsg            \
  15         -lClntOptions -lOptions -lLowLevel \
  16         -L$(MISC)         -lMisc           \
  17 -       -L$(POSLIB)       $(CLNTPOSLIB)
  18 +       -L$(POSLIB)       $(CLNTPOSLIB) \
  19 +       $(CLNT_LIBS)
  20
  21  ifndef MOD_CLNT_DISABLE_DNSUPDATE
  22  CLNTPOSLIB=-lposlib
  23 @@ -60,7 +61,7 @@
  24
  25  $(SERVERBIN): libposlib includes commonlibs srvlibs $(MISC)/DHCPServer.o $(SERVER)
  26         @echo "[LINK   ] $(SUBDIR)/$@ ($(LINKPRINT))"
  27 -       $(CXX) $(SRV_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPServer.o $(SERVER)  \
  28 +       $(CXXLD) $(SRV_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPServer.o $(SERVER)  \
  29         -L$(SRVADDRMGR)   -lSrvAddrMgr     \
  30         -L$(ADDRMGR)      -lAddrMgr        \
  31         -L$(LOWLEVEL)                      \
  32 @@ -81,7 +82,8 @@
  33         -L$(MISC)        -lMisc            \
  34         -L$(LOWLEVEL)    -lLowLevel        \
  35         -L$(IFACEMGR)    -lIfaceMgr        \
  36 -       -L$(POSLIB)      $(SRVPOSLIB)
  37 +       -L$(POSLIB)      $(SRVPOSLIB) \
  38 +       $(SRV_LIBS)
  39
  40  ifndef MOD_SRV_DISABLE_DNSUPDATE
  41  SRVPOSLIB=-lposlib
  42 @@ -91,7 +93,7 @@
  43
  44  $(RELAYBIN): poslib-configure includes commonlibs relaylibs $(MISC)/DHCPRelay.o $(RELAY)
  45         @echo "[LINK   ] $(SUBDIR)/$@ ($(LINKPRINT))"
  46 -       $(CXX) $(REL_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPRelay.o $(RELAY)  \
  47 +       $(CXXLD) $(REL_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPRelay.o $(RELAY)  \
  48         -L$(RELTRANSMGR) -lRelTransMgr  \
  49         -L$(RELCFGMGR)   -lRelCfgMgr    \
  50         -L$(RELIFACEMGR) -lRelIfaceMgr  \
  51 @@ -104,7 +106,8 @@
  52         -L$(MESSAGES)    -lMsg          \
  53         -L$(MISC)        -lMisc         \
  54         -L$(OPTIONS)     -lOptions      \
  55 -       -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions
  56 +       -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions \
  57 +       $(SRV_LIBS)
  58
  59  objs:  includes
  60         @for dir in $(COMMONSUBDIRS); do \
  61 diff -ruN dibbler-0.6.0-RC1-old/Makefile.inc dibbler-0.6.0-RC1-new/Makefile.inc
  62 --- dibbler-0.6.0-RC1-old/Makefile.inc  2007-02-03 19:02:11.000000000 +0100
  63 +++ dibbler-0.6.0-RC1-new/Makefile.inc  2007-09-01 04:56:44.000000000 +0200
  64 @@ -1,5 +1,6 @@
  65  # === used tools ===
  66  CXX          = g++
  67 +CXXLD        = $(CXX)
  68  CC           = gcc
  69  FLEX         = flex
  70  BISONPP      = $(PREFIX)/bison++/bison++ -S $(PREFIX)/bison++/bison.cc -H $(PREFIX)/bison++/bison.h