forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
zlib: fix cross-compilation not producing shared libraries
Apply patch that already has been applied upstream: - madler/zlib#607 - madler/zlib@05796d3
- Loading branch information
Showing
2 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
pkgs/development/libraries/zlib/fix-configure-issue-cross.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |