Skip to content

Commit

Permalink
zlib: fix cross-compilation not producing shared libraries
Browse files Browse the repository at this point in the history
Apply patch that already has been applied upstream:
- madler/zlib#607
- madler/zlib@05796d3
  • Loading branch information
Mindavi committed Apr 5, 2022
1 parent e2166cd commit f091c0e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkgs/development/libraries/zlib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 24 additions & 0 deletions pkgs/development/libraries/zlib/fix-configure-issue-cross.patch
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit f091c0e

Please sign in to comment.