- replaced BR: tetex-* with corrected BR: texlive-* ones

[packages/iproute2.git] / iproute2-build.patch

diff --git a/iproute2-build.patch b/iproute2-build.patch
index b1a46d5c6359ef21575858c119229458bba53a5b..8e027a3394d5575bee20cfd7f175aaf3430254f3 100644 (file)
--- a/iproute2-build.patch
+++ b/iproute2-build.patch
@@ -1,36 +1,37 @@
-diff -urN iproute2-2.6.7.org/include/rt_names.h iproute2-2.6.7/include/rt_names.h
---- iproute2-2.6.7.org/include/rt_names.h      2004-06-16 21:07:09.457517808 +0200
-+++ iproute2-2.6.7/include/rt_names.h  2004-06-16 21:12:26.790275896 +0200
-@@ -1,6 +1,8 @@
- #ifndef RT_NAMES_H_
- #define RT_NAMES_H_ 1
+diff -urNbB iproute2-2.6.14-051107.org/configure iproute2-2.6.14-051107/configure
+--- iproute2-2.6.14-051107.org/configure       2005-01-18 00:26:46.000000000 +0100
++++ iproute2-2.6.14-051107/configure   2005-11-10 16:04:15.024922750 +0100
+@@ -5,7 +5,7 @@
  
-+#include <asm/byteorder.h>
-+
- const char* rtnl_rtprot_n2a(int id, char *buf, int len);
- const char* rtnl_rtscope_n2a(int id, char *buf, int len);
- const char* rtnl_rttable_n2a(int id, char *buf, int len);
-diff -urN iproute2-2.6.7.org/lib/rt_names.c iproute2-2.6.7/lib/rt_names.c
---- iproute2-2.6.7.org/lib/rt_names.c  2004-06-16 21:07:09.400526472 +0200
-+++ iproute2-2.6.7/lib/rt_names.c      2004-06-16 21:10:48.897157912 +0200
-@@ -16,6 +16,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <sys/time.h>
-+#include <asm/byteorder.h>
- 
- static void rtnl_tab_initialize(char *file, char **tab, int size)
+ function check_atm
  {
-diff -urN iproute2-2.6.7.org/Makefile iproute2-2.6.7/Makefile
---- iproute2-2.6.7.org/Makefile        2004-06-16 21:07:09.445519632 +0200
-+++ iproute2-2.6.7/Makefile    2004-06-16 21:10:12.256728104 +0200
-@@ -4,13 +4,10 @@
- CONFDIR=/etc/iproute2
- DOCDIR=/usr/doc/iproute2
- 
--KERNEL_INCLUDE=/usr/include
--LIBC_INCLUDE=/usr/include
--
+-cat >/tmp/atmtest.c <<EOF
++cat >atmtest.c <<EOF
+ #include <atm.h>
+ int main(int argc, char **argv) {
+       struct atm_qos qos;
+@@ -16,7 +16,7 @@
+       return 0;
+ }
+ EOF
+-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 
++gcc -I$INCLUDE -o atmtest atmtest.c -latm >/dev/null 2>&1 
+ if [ $? -eq 0 ]
+ then
+     echo "TC_CONFIG_ATM:=y" >>Config
+@@ -21,7 +21,7 @@
+ else
+     echo no
+ fi
+-rm -f /tmp/atmtest.c /tmp/atmtest
++rm -f atmtest*
+ }
+ 
+ function check_xt
+diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
+--- iproute2-2.6.14-051107.org/Makefile        2005-07-09 00:08:47.000000000 +0200
++++ iproute2-2.6.14-051107/Makefile    2005-11-10 16:04:15.024922750 +0100
+@@ -10,7 +10,7 @@
  DEFINES= -DRESOLVE_HOSTNAMES
  
  #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
@@ -38,26 +39,13 @@ diff -urN iproute2-2.6.7.org/Makefile iproute2-2.6.7/Makefile
 +LDLIBS=
  ADDLIB=
  
- #options if you compile with libc5, and without a bind>=4.9.4 libresolv
-@@ -23,19 +20,9 @@
- #options for ipx
- ADDLIB+=ipx_ntop.o ipx_pton.o
+ #options for decnet
+@@ -21,7 +21,7 @@
  
--ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
--  ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
--    GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
--  endif
--endif
--ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
--  GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
--endif
--
--
  CC = gcc
--CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
-+CCOPTS = -D_GNU_SOURCE $(OPT) -Wstrict-prototypes -Wall -g
-+CFLAGS = $(CCOPTS) -I../include $(DEFINES)
- 
- LDLIBS += -L../lib -lnetlink -lutil
+ HOSTCC = gcc
+-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CCOPTS = -D_GNU_SOURCE $(OPT) -Wstrict-prototypes -Wall
+ CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v