mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-21 05:43:09 +00:00
878a16a13a
Brings in the following changes - Fix a bug when getting a gzip header extra field with inflateGetHeader(). This remedies CVE-2022-37434. - Fix a bug in block type selection when Z_FIXED used. Now the smallest block type is selected, for better compression. - Fix a configure issue that discarded the provided CC definition. - Correct incorrect inputs provided to the CRC functions. This mitigates a bug in Java. - Repair prototypes and exporting of the new CRC functions. - Fix inflateBack to detect invalid input with distances too far. Mark zlib-1.2.12 as obsolete. Signed-off-by: Chris Packham <judge.packham@gmail.com>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From: Heiko Lewin <heiko.lewin@worldiety.de>
|
|
Date: Fri, 22 May 2020 03:32:33 +0200
|
|
Subject: configure: use LIBTOOL variable for Darwin builds
|
|
|
|
---
|
|
configure | 10 ++++++++--
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -69,6 +69,12 @@
|
|
else
|
|
NM=${NM-"nm"}
|
|
fi
|
|
+if "${CROSS_PREFIX}libtool" --version >/dev/null 2>/dev/null || test $? -lt 126; then
|
|
+ LIBTOOL=${LIBTOOL-"${CROSS_PREFIX}libtool"}
|
|
+ test -n "${CROSS_PREFIX}" && echo Using ${LIBTOOL} | tee -a configure.log
|
|
+else
|
|
+ LIBTOOL=${LIBTOOL-"libtool"}
|
|
+fi
|
|
|
|
# set defaults before processing command line options
|
|
LDCONFIG=${LDCONFIG-"ldconfig"}
|
|
@@ -260,8 +266,8 @@
|
|
SHAREDLIBV=libz.$VER$shared_ext
|
|
SHAREDLIBM=libz.$VER1$shared_ext
|
|
LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
|
|
- if libtool -V 2>&1 | grep Apple > /dev/null; then
|
|
- AR="libtool"
|
|
+ if ${LIBTOOL} -V 2>&1 | grep Apple > /dev/null; then
|
|
+ AR="${LIBTOOL}"
|
|
else
|
|
AR="/usr/bin/libtool"
|
|
fi
|