diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-04-12 21:28:45 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-04-12 21:28:45 +0000 |
| commit | 02ff38f7b114ccf3a60dc25f0f0620890add1518 (patch) | |
| tree | 0ceb5f7c2f333848a2ea7a16e5f462af43745950 /pkgs/tools/misc | |
| parent | 351bcc3b7076e7486fbf7730fbf219f901de74f9 (diff) | |
| download | nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.tar nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.tar.gz nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.tar.bz2 nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.tar.lz nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.tar.xz nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.tar.zst nixlib-02ff38f7b114ccf3a60dc25f0f0620890add1518.zip | |
Patch unused variable errors
svn path=/nixpkgs/trunk/; revision=33768
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/fileschanged/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/fileschanged/unused-variables.debian.patch | 48 |
2 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 5619174f74f0..d0a03f955a89 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ fam ]; + patches = [./unused-variables.debian.patch]; + doCheck = true; meta = { diff --git a/pkgs/tools/misc/fileschanged/unused-variables.debian.patch b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch new file mode 100644 index 000000000000..73d307f9413d --- /dev/null +++ b/pkgs/tools/misc/fileschanged/unused-variables.debian.patch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_unused_variables.dpatch by Colin Watson <cjwatson@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: GCC 4.6 warns about unused variables, and fileschanged builds with +## DP: -Werror, so deal with unused variable warnings. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/monitor.c fileschanged-0.6.5/src/monitor.c +--- fileschanged-0.6.5~/src/monitor.c 2006-04-19 20:42:29.000000000 +0100 ++++ fileschanged-0.6.5/src/monitor.c 2011-09-14 01:17:23.000000000 +0100 +@@ -84,6 +84,7 @@ + retval = FAMMonitorDirectory (c, node->filename, &node->request, + (void *) node); + //printf ("FAMMonitorDirectory returns %d (reqnum %d)\n", retval, node->request.reqnum); ++ (void) retval; + } + else if (S_ISREG (node->statbuf.st_mode)) + { +@@ -91,6 +92,7 @@ + retval = FAMMonitorFile (c, node->filename, &node->request, + (void *) node); + //printf ("FAMMonitorFile returns %d (reqnum %d)\n", retval, node->request.reqnum); ++ (void) retval; + } + monitor_handle_events (c, list, 0, 30); + } + +diff -r -U3 fileschanged-0.6.9-orig/src/main.c fileschanged-0.6.9/src/main.c +--- fileschanged-0.6.9-orig/src/main.c 2012-04-13 01:31:59.160601022 +0400 ++++ fileschanged-0.6.9/src/main.c 2012-04-13 01:32:47.549599643 +0400 +@@ -126,6 +126,7 @@ + { + retval = process_file (filelist, filelist_len, arguments.args[i]); + } ++ (void) retval; + return 0; + } + +@@ -168,6 +169,7 @@ + + if (fileptr != stdin) + fclose (fileptr); ++ (void) retval; + return 0; + } + int + |