diff options
| author | Shea Levy <shea@shealevy.com> | 2012-07-02 11:27:25 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-07-02 11:27:25 -0400 |
| commit | 015e7594d0d7fe91296df94641f2d9a2a9047219 (patch) | |
| tree | f7cc90484c83c1184d7ef7b3cb719f5e5141dd19 /pkgs/tools/compression | |
| parent | 8cc0edaeba590df8d5e20bb78378159eafe6ef87 (diff) | |
| parent | f9d9a0c4ca6a0ac2630d49a1dd4f1cc4ac3131e7 (diff) | |
| download | nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.tar nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.tar.gz nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.tar.bz2 nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.tar.lz nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.tar.xz nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.tar.zst nixlib-015e7594d0d7fe91296df94641f2d9a2a9047219.zip | |
Merge remote-tracking branch 'upstream/master' into stdenv-updates
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/compression/gzip/gets-undeclared.patch | 26 |
2 files changed, 37 insertions, 1 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b32bbb932e84..e1d6d75da51a 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gzip-1.4"; src = fetchurl { @@ -31,3 +31,13 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } + +// + +{ + crossAttrs = + # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. + (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { + patches = [ ./gets-undeclared.patch ]; + }); +}) diff --git a/pkgs/tools/compression/gzip/gets-undeclared.patch b/pkgs/tools/compression/gzip/gets-undeclared.patch new file mode 100644 index 000000000000..a09f59b122a2 --- /dev/null +++ b/pkgs/tools/compression/gzip/gets-undeclared.patch @@ -0,0 +1,26 @@ +This patch is needed to allow builds with newer versions of +the GNU libc (2.16+). + +This is a backport of this patch: + +commit 66712c23388e93e5c518ebc8515140fa0c807348 +Author: Eric Blake <eblake@redhat.com> +Date: Thu Mar 29 13:30:41 2012 -0600 + + stdio: don't assume gets any more + +--- gzip/lib/stdio.in.h 2012-07-02 14:28:45.000000000 +0200 ++++ gzip/lib/stdio.in.h 2012-07-02 14:28:50.000000000 +0200 +@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not + "use gnulib module fflush for portable POSIX compliance"); + #endif + +-/* It is very rare that the developer ever has full control of stdin, +- so any use of gets warrants an unconditional warning. Assume it is +- always declared, since it is required by C89. */ +-#undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +- + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) |