summary refs log tree commit diff
path: root/pkgs/os-specific/linux/iproute
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2013-04-06 00:05:14 +0200
committerPeter Simons <simons@cryp.to>2013-04-07 23:33:20 +0200
commit9608d80c73fe7781d224297f5d58a63e8850097f (patch)
treed9fa322cda578891450785074583777d02167316 /pkgs/os-specific/linux/iproute
parentc976480a01f96652c4e33576de45a0ad31be7e0d (diff)
downloadnixlib-9608d80c73fe7781d224297f5d58a63e8850097f.tar
nixlib-9608d80c73fe7781d224297f5d58a63e8850097f.tar.gz
nixlib-9608d80c73fe7781d224297f5d58a63e8850097f.tar.bz2
nixlib-9608d80c73fe7781d224297f5d58a63e8850097f.tar.lz
nixlib-9608d80c73fe7781d224297f5d58a63e8850097f.tar.xz
nixlib-9608d80c73fe7781d224297f5d58a63e8850097f.tar.zst
nixlib-9608d80c73fe7781d224297f5d58a63e8850097f.zip
iproute: don't compile with -Werror
  lnstat.c:169:30: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess]
     memset(th.hdr[i], 0, sizeof(th.hdr[i]));
                                ^
  cc1: all warnings being treated as errors
  make[1]: *** [lnstat.o] Error 1
Diffstat (limited to 'pkgs/os-specific/linux/iproute')
-rw-r--r--pkgs/os-specific/linux/iproute/default.nix2
-rw-r--r--pkgs/os-specific/linux/iproute/no-werror.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 5c0f48b2901f..4ea4152e30d4 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0kqy30wz2krbg4y7750hjq5218hgy2vj9pm5qzkn1bqskxs4b4ap";
   };
 
-  patches = [ ./vpnc.patch ];
+  patches = [ ./vpnc.patch ./no-werror.patch ];
 
   preConfigure =
     ''
diff --git a/pkgs/os-specific/linux/iproute/no-werror.patch b/pkgs/os-specific/linux/iproute/no-werror.patch
new file mode 100644
index 000000000000..593b56b8de09
--- /dev/null
+++ b/pkgs/os-specific/linux/iproute/no-werror.patch
@@ -0,0 +1,12 @@
+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)