alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Upgrade iproute2 from 3.8.0 -> 3.12.0

Browse source 
Additionally rmeove the werror patch as it is not needed for the build
anymore.
This commit is contained in:
William A. Kennington III 2013-11-28 01:37:30 -06:00
parent c7ae9e39d9
commit f18efaf26e
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/iproute/default.nix
View file

@ -1,14 +1,14 @@
{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: { fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "iproute2-3.8.0"; name = "iproute2-3.12.0";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap"; sha256 = "04gi11gh087bg2nlxhj0lxrk8l9qxkpr88nsiil23917bm3h1xj4";
}; };
patches = [ ./vpnc.patch ./no-werror.patch ]; patch = [ "vpnc.patch" ];
preConfigure = preConfigure =
'' ''
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
sed -e '/ARPDDIR/d' -i Makefile sed -e '/ARPDDIR/d' -i Makefile
''; '';
postConfigure = "cat Config";
makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin"
+ " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}"
+ " MANDIR=$(out)/share/man"; + " MANDIR=$(out)/share/man";

12
pkgs/os-specific/linux/iproute/no-werror.patch
View file

@ -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)