From 18cbc51f3263162bab534ea7ad68c766fc83e5b8 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Thu, 28 Aug 2003 20:34:48 +0000
Subject: [PATCH] fix include order in iproute2

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1239 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/iproute2/new-kernels.patch | 22 ----------------------
 package/base/iproute2/no_werror.patch   | 14 ++++++++++----
 2 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 package/base/iproute2/new-kernels.patch

diff --git a/package/base/iproute2/new-kernels.patch b/package/base/iproute2/new-kernels.patch
deleted file mode 100644
index 8d4d5467f..000000000
--- a/package/base/iproute2/new-kernels.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-
-This should fix the compilation for new kernels.
-
-  - alan.rock@glaramara.freeserve.co.uk
-
-diff -Naur iproute2.rockpatched/Makefile iproute2/Makefile
---- iproute2.rockpatched/Makefile	2003-08-27 13:53:08.000000000 +0100
-+++ iproute2/Makefile	2003-08-27 13:53:35.000000000 +0100
-@@ -20,11 +20,11 @@
- 
- 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
-+    GLIBCFIX=-include ../include-glibc/glibc-bugs.h
-   endif
- endif
- ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
--  GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
-+  GLIBCFIX=-include ../include-glibc/glibc-bugs.h
- endif
- 
- CC = gcc
diff --git a/package/base/iproute2/no_werror.patch b/package/base/iproute2/no_werror.patch
index a54d5cc96..1bf4b16f8 100644
--- a/package/base/iproute2/no_werror.patch
+++ b/package/base/iproute2/no_werror.patch
@@ -20,14 +20,20 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./Makefile.orig	2002-10-30 21:19:05.000000000 +0100
-+++ ./Makefile	2002-10-30 21:19:56.000000000 +0100
-@@ -28,7 +28,7 @@
+The include order need to be changed since a usr/include/utils.h might
+exist (cdparanoia). With new gcc the source yields some warnings so
+-Werror needs to be stripped ...
+
+--- Makefile.orig	2001-08-02 08:37:03.000000000 +0200
++++ Makefile	2003-08-28 22:29:43.000000000 +0200
+@@ -28,8 +28,8 @@
  endif
  
  CC = gcc
 -CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -Werror -g
+-CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
 +CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
- CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
++CFLAGS = $(CCOPTS) -I../include $(GLIBCFIX) -I$(KERNEL_INCLUDE) $(DEFINES)
  
  LDLIBS += -L../lib -lnetlink -lutil
+