JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix zlib 1.2.5 on Cygwin. (The Makefile doesn't support building

Browse Source 
just a static library.)

svn path=/nixpkgs/trunk/; revision=22748
This commit is contained in:
Eelco Dolstra 2010-07-27 11:37:29 +00:00
parent 42016ca6aa
commit 3c57f1fd8a
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/zlib/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, static ? false}: {stdenv, fetchurl, static ? false}:
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "zlib-1.2.5"; name = "zlib-1.2.5";
src = fetchurl { src = fetchurl {
@ -23,4 +23,7 @@ stdenv.mkDerivation rec {
# zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
cygwinConfigureEnableShared = true; cygwinConfigureEnableShared = true;
}
} // stdenv.lib.optionalAttrs (stdenv.system == "i686-cygwin") {
patches = [ ./no-shared.patch ];
})

14
pkgs/development/libraries/zlib/no-shared.patch Normal file
View File

@ -0,0 +1,14 @@
Support building the static library only.
diff -ru -x '*~' zlib-1.2.5-orig/Makefile.in zlib-1.2.5/Makefile.in
--- zlib-1.2.5-orig/Makefile.in 2010-04-20 06:12:21.000000000 +0200
+++ zlib-1.2.5/Makefile.in 2010-07-27 13:25:02.176322291 +0200
@@ -168,7 +168,7 @@
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
cp $(STATICLIB) $(DESTDIR)$(libdir)
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ test -z "$(SHAREDLIBV)" || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \