From 4fc8e64a40e8e6d7151640c9b76dbab38f51d254 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Thu, 16 May 2013 00:04:48 +0000
Subject: iproute2: workaround compile issues with gcc 4.8.x

SVN-Revision: 36642
---
 package/network/utils/iproute2/Makefile                      |  2 +-
 package/network/utils/iproute2/patches/000-warnings.patch    | 12 ++++++++++++
 package/network/utils/iproute2/patches/008-no_netem.patch    |  2 +-
 .../network/utils/iproute2/patches/110-extra-ccopts.patch    |  4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 package/network/utils/iproute2/patches/000-warnings.patch

(limited to 'package/network/utils/iproute2')

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 8e25f867b2..ff80df4111 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
 PKG_VERSION:=3.9.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
diff --git a/package/network/utils/iproute2/patches/000-warnings.patch b/package/network/utils/iproute2/patches/000-warnings.patch
new file mode 100644
index 0000000000..8f07c3896b
--- /dev/null
+++ b/package/network/utils/iproute2/patches/000-warnings.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,7 @@ CC = gcc
+ HOSTCC = gcc
+ DEFINES += -D_GNU_SOURCE
+ CCOPTS = -O2
+-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
+-WFLAGS += -Wmissing-declarations -Wold-style-definition
++WFLAGS := -Wall -Wstrict-prototypes
+ 
+ CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch
index 165ce0c9b9..78baeadbd1 100644
--- a/package/network/utils/iproute2/patches/008-no_netem.patch
+++ b/package/network/utils/iproute2/patches/008-no_netem.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -36,7 +36,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
+@@ -35,7 +35,7 @@ WFLAGS := -Wall -Wstrict-prototypes
  CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
  YACCFLAGS = -d -t -v
  
diff --git a/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch
index af38fe1989..71ec957ad0 100644
--- a/package/network/utils/iproute2/patches/110-extra-ccopts.patch
+++ b/package/network/utils/iproute2/patches/110-extra-ccopts.patch
@@ -6,6 +6,6 @@
  DEFINES += -D_GNU_SOURCE
 -CCOPTS = -O2
 +CCOPTS = -O2 $(EXTRA_CCOPTS)
- WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
- WFLAGS += -Wmissing-declarations -Wold-style-definition
+ WFLAGS := -Wall -Wstrict-prototypes
  
+ CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
-- 
cgit v1.2.3