ipv6/dibbler/patches/001-cross_compile.patch

   1 diff -ruN dibbler-0.5.0-old/Makefile dibbler-0.5.0-new/Makefile
   2 --- dibbler-0.5.0-old/Makefile  2006-10-06 00:58:22.000000000 +0200
   3 +++ dibbler-0.5.0-new/Makefile  2007-01-31 18:03:24.000000000 +0100
   4 @@ -50,7 +50,8 @@
   5         -L$(MISC)         -lMisc           \
   6         -L$(MESSAGES)     -lMsg            \
   7         -lClntOptions -lOptions -lLowLevel \
   8 -       -L$(POSLIB)       $(CLNTPOSLIB)
   9 +       -L$(POSLIB)       $(CLNTPOSLIB) \
  10 +       $(CLNT_LIBS)
  11
  12  ifndef MOD_CLNT_DISABLE_DNSUPDATE
  13  CLNTPOSLIB=-lposlib
  14 @@ -81,7 +82,9 @@
  15         -L$(OPTIONS)     -lOptions         \
  16         -L$(LOWLEVEL)    -lLowLevel        \
  17         -L$(IFACEMGR)    -lIfaceMgr        \
  18 -       -L$(POSLIB)      $(SRVPOSLIB)
  19 +       -L$(POSLIB)      $(SRVPOSLIB)      \
  20 +       $(SRV_LIBS)
  21 +
  22
  23  ifndef MOD_SRV_DISABLE_DNSUPDATE
  24  SRVPOSLIB=-lposlib
  25 @@ -104,7 +107,8 @@
  26         -L$(MESSAGES)    -lMsg          \
  27         -L$(MISC)        -lMisc         \
  28         -L$(OPTIONS)     -lOptions      \
  29 -       -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions
  30 +       -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions \
  31 +       $(SRV_LIBS)
  32
  33  objs:  includes
  34         @for dir in $(COMMONSUBDIRS); do \
  35 diff -ruN dibbler-0.5.0-old/Makefile.inc dibbler-0.5.0-new/Makefile.inc
  36 --- dibbler-0.5.0-old/Makefile.inc      2006-08-22 02:11:49.000000000 +0200
  37 +++ dibbler-0.5.0-new/Makefile.inc      2007-01-31 17:43:07.000000000 +0100
  38 @@ -5,7 +5,7 @@
  39  BISONPP      = $(PREFIX)/bison++/bison++ -S $(PREFIX)/bison++/bison.cc -H $(PREFIX)/bison++/bison.h
  40
  41  # === compiler options ===
  42 -COPTS        = -D$(ARCH) $(PORT_CFLAGS) $(XMLCFLAGS) -I $(INCDIR) $(DEBUGINFO) -Wall -funsigned-char -O0 $(PEDANTIC)
  43 +COPTS        = -D$(ARCH) $(PORT_CFLAGS) $(XMLCFLAGS) -I $(INCDIR) $(DEBUGINFO) -Wall -funsigned-char $(PEDANTIC)
  44  OPTS         = -ftemplate-depth-40 $(COPTS) $(CFLAGS) $(CXXFLAGS)
  45
  46  # === linker options ===
  47 @@ -124,7 +124,7 @@
  48
  49  %.a: objs
  50         @echo "[LIB    ] $(SUBDIR)/$@"
  51 -       ar cr $@ $(OBJECTS)
  52 +       $(AR) cr $@ $(OBJECTS)
  53
  54  all: libs
  55