summaryrefslogtreecommitdiff
path: root/package/network/utils/iproute2
diff options
context:
space:
mode:
authorluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-05-16 00:04:48 +0000
committerluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-05-16 00:04:48 +0000
commit26007de2534d082bd456fe36da346476e8ae5ff2 (patch)
tree02553caf568934c4a908be3cb70b5ddacfaed0a8 /package/network/utils/iproute2
parent7250274a76ea32607ac1817aa7d062f9ae4ebb2a (diff)
[package] iproute2: workaround compile issues with gcc 4.8.x
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36642 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/iproute2')
-rw-r--r--package/network/utils/iproute2/Makefile2
-rw-r--r--package/network/utils/iproute2/patches/000-warnings.patch12
-rw-r--r--package/network/utils/iproute2/patches/008-no_netem.patch2
-rw-r--r--package/network/utils/iproute2/patches/110-extra-ccopts.patch4
4 files changed, 16 insertions, 4 deletions
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)