Author: ludo Date: Fri May 25 09:11:51 2012 New Revision: 34240 URL: https://nixos.org/websvn/nix/?rev=34240&sc=1
Log: GNU Awk: Fix Cygwin builds. Added: nixpkgs/trunk/pkgs/tools/text/gawk/cygwin-identifiers.patch Modified: nixpkgs/trunk/pkgs/tools/text/gawk/default.nix Added: nixpkgs/trunk/pkgs/tools/text/gawk/cygwin-identifiers.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/tools/text/gawk/cygwin-identifiers.patch Fri May 25 09:11:51 2012 (r34240) @@ -0,0 +1,75 @@ +This patch fixes compilation on Windows, where some of the identifiers +would clash. + +commit 5a0b7f9953f24dc034eca4052214da49fbad8bd0 +Author: Arnold D. Robbins <[email protected]> +Date: Fri Jul 29 13:25:57 2011 +0300 + + Fix DJGPP problem with libsigsegv. + +diff --git a/builtin.c b/builtin.c +index 4d87592..941f5ad 100644 +--- a/builtin.c ++++ b/builtin.c +@@ -605,7 +605,7 @@ format_tree( + NODE *arg; + long fw, prec, argnum; + int used_dollar; +- int lj, alt, big, bigbig, small, have_prec, need_format; ++ int lj, alt, big_flag, bigbig_flag, small_flag, have_prec, need_format; + long *cur = NULL; + uintmax_t uval; + int sgn; +@@ -725,7 +725,7 @@ format_tree( + signchar = FALSE; + zero_flag = FALSE; + quote_flag = FALSE; +- lj = alt = big = bigbig = small = FALSE; ++ lj = alt = big_flag = bigbig_flag = small_flag = FALSE; + fill = sp; + cp = cend; + chbuf = lchbuf; +@@ -907,7 +907,7 @@ check_pos: + goto retry; + #endif + case 'l': +- if (big) ++ if (big_flag) + break; + else { + static short warned = FALSE; +@@ -921,10 +921,10 @@ check_pos: + goto out; + } + } +- big = TRUE; ++ big_flag = TRUE; + goto retry; + case 'L': +- if (bigbig) ++ if (bigbig_flag) + break; + else { + static short warned = FALSE; +@@ -938,10 +938,10 @@ check_pos: + goto out; + } + } +- bigbig = TRUE; ++ bigbig_flag = TRUE; + goto retry; + case 'h': +- if (small) ++ if (small_flag) + break; + else { + static short warned = FALSE; +@@ -955,7 +955,7 @@ check_pos: + goto out; + } + } +- small = TRUE; ++ small_flag = TRUE; + goto retry; + case 'c': + need_format = FALSE; Modified: nixpkgs/trunk/pkgs/tools/text/gawk/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/text/gawk/default.nix Fri May 25 08:15:41 2012 (r34239) +++ nixpkgs/trunk/pkgs/tools/text/gawk/default.nix Fri May 25 09:11:51 2012 (r34240) @@ -1,6 +1,6 @@ { stdenv, fetchurl, libsigsegv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gawk-4.0.0"; src = fetchurl { @@ -37,3 +37,9 @@ maintainers = [ stdenv.lib.maintainers.ludo ]; }; } + +// + +stdenv.lib.optionalAttrs stdenv.isCygwin { + patches = [ ./cygwin-identifiers.patch ]; +}) _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
