- fix compiler warning:

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

diff --git a/iproute2-Makefile.patch b/iproute2-Makefile.patch
index 8980c6992a146b7d26ac6de5ef1c322eebb6b97b..5c73c30a750b2234e2499200099a5eecc05333d5 100644 (file)
--- a/iproute2-Makefile.patch
+++ b/iproute2-Makefile.patch
@@ -1,12 +1,17 @@
---- iproute2/Makefile.orig     2002-01-16 00:30:32.000000000 +0100
-+++ iproute2/Makefile  2004-04-04 22:19:16.964825648 +0200
-@@ -4,13 +4,11 @@
- CONFDIR=/etc/iproute2
- DOCDIR=/usr/doc/iproute2
+--- iproute2/misc/Makefile.orig        2002-01-16 00:30:32.000000000 +0100
++++ iproute2/misc/Makefile     2004-04-04 22:23:44.718120960 +0200
+@@ -6,7 +6,7 @@
+ RTSTATOBJ=rtstat.o
  
--KERNEL_INCLUDE=/usr/src/linux/include
--LIBC_INCLUDE=/usr/include
+ ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ)
+-TARGETS=ss nstat ifstat rtacct arpd rtstat
++TARGETS=ss nstat ifstat rtacct rtstat
  
+ all: $(TARGETS)
+ 
+--- iproute2/Makefile~ 2004-05-01 21:30:53.000000000 +0000
++++ iproute2/Makefile  2004-05-01 21:33:14.000000000 +0000
+@@ -8,7 +8,7 @@
  DEFINES= -DRESOLVE_HOSTNAMES
  
  #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
@@ -15,58 +20,12 @@
  ADDLIB=
  
  #options if you compile with libc5, and without a bind>=4.9.4 libresolv
-@@ -23,19 +21,9 @@
- #options for ipx
- ADDLIB+=ipx_ntop.o ipx_pton.o
+@@ -24,7 +24,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)
+ CFLAGS = $(CCOPTS) -I../include $(DEFINES)
  
  LDLIBS += -L../lib -lnetlink -lutil
- 
-@@ -43,20 +31,10 @@
- 
- LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
- 
--all: check-kernel
--      @set -e; \
-+all:
-       for i in $(SUBDIRS); \
-       do $(MAKE) -C $$i; done
- 
--check-kernel:
--ifeq ($(KERNEL_INCLUDE),)
--      @echo "Please, set correct KERNEL_INCLUDE"; false
--else
--      @set -e; \
--      if [ ! -r $(KERNEL_INCLUDE)/linux/autoconf.h ]; then \
--              echo "Please, compile the kernel first"; false; fi
--endif
--
- install: all
-       install -m 0755 -d $(DESTDIR)$(SBINDIR)
-       install -m 0755 -d $(DESTDIR)$(CONFDIR)
---- iproute2/misc/Makefile.orig        2002-01-16 00:30:32.000000000 +0100
-+++ iproute2/misc/Makefile     2004-04-04 22:23:44.718120960 +0200
-@@ -6,7 +6,7 @@
- RTSTATOBJ=rtstat.o
- 
- ALLOBJ=$(SSOBJ) $(NSTATOBJ) $(IFSTATOBJ) $(RTACCTOBJ) $(ARPDOBJ) $(RTSTATOBJ)
--TARGETS=ss nstat ifstat rtacct arpd rtstat
-+TARGETS=ss nstat ifstat rtacct rtstat
- 
- all: $(TARGETS)
-