Upgrade iproute2 from 3.8.0 -> 3.12.0
Additionally rmeove the werror patch as it is not needed for the build anymore.
This commit is contained in:
parent
c7ae9e39d9
commit
f18efaf26e
@ -1,14 +1,14 @@
|
||||
{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iproute2-3.8.0";
|
||||
name = "iproute2-3.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
|
||||
sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap";
|
||||
sha256 = "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4";
|
||||
};
|
||||
|
||||
patches = [ ./vpnc.patch ./no-werror.patch ];
|
||||
patch = [ "vpnc.patch" ];
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
|
||||
sed -e '/ARPDDIR/d' -i Makefile
|
||||
'';
|
||||
|
||||
postConfigure = "cat Config";
|
||||
|
||||
makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin"
|
||||
+ " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
|
||||
+ " MANDIR=$(out)/share/man";
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -ubr iproute2-3.8.0-orig/Makefile iproute2-3.8.0/Makefile
|
||||
--- iproute2-3.8.0-orig/Makefile 2013-04-06 00:03:21.072827860 +0200
|
||||
+++ iproute2-3.8.0/Makefile 2013-04-06 00:03:25.353837862 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
HOSTCC = gcc
|
||||
DEFINES += -D_GNU_SOURCE
|
||||
CCOPTS = -O2
|
||||
-WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes
|
||||
+WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes
|
||||
WFLAGS += -Wmissing-declarations -Wold-style-definition
|
||||
|
||||
CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES)
|
Loading…
Reference in New Issue
Block a user