zlib: fix cross-compilation not producing shared libraries

Apply patch that already has been applied upstream:
- https://github.com/madler/zlib/pull/607
- 05796d3d8d

(cherry picked from commit f091c0e80d)
main
Rick van Schijndel 2 years ago committed by Andrew Childs
parent 1b0392052d
commit e3d9b21159
  1. 4
      pkgs/development/libraries/zlib/default.nix
  2. 24
      pkgs/development/libraries/zlib/fix-configure-issue-cross.patch

@ -40,6 +40,10 @@ stdenv.mkDerivation (rec {
--replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
'';
patches = [
./fix-configure-issue-cross.patch
];
outputs = [ "out" "dev" ]
++ lib.optional splitStaticOutput "static";
setOutputFlags = false;

@ -0,0 +1,24 @@
From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 28 Mar 2022 18:34:10 -0700
Subject: [PATCH] Fix configure issue that discarded provided CC definition.
---
configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure b/configure
index 52ff4a04e..3fa3e8618 100755
--- a/configure
+++ b/configure
@@ -174,7 +174,10 @@ if test -z "$CC"; then
else
cc=${CROSS_PREFIX}cc
fi
+else
+ cc=${CC}
fi
+
cflags=${CFLAGS-"-O3"}
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
case "$cc" in
Loading…
Cancel
Save