fix cc zlib-1.2.12; add patch

diff --git a/archive-patches/zlib-1.2.12-fix-cc.patch b/archive-patches/zlib-1.2.12-fix-cc.patch
new file mode 100644 (file)
index 0000000..1e893e1
--- /dev/null
+++ b/archive-patches/zlib-1.2.12-fix-cc.patch
@@ -0,0 +1,20 @@
+--- a/configure        2022-03-28 01:39:42.000000000 +0200
++++ b/configure        2022-04-10 14:35:56.606733825 +0200
+@@ -167,14 +167,9 @@ extern int getchar();
+ int hello() {return getchar();}
+ EOF
+ 
+-if test -z "$CC"; then
+-  echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
+-  if ${CROSS_PREFIX}gcc -v >/dev/null 2>&1; then
+-    cc=${CROSS_PREFIX}gcc
+-  else
+-    cc=${CROSS_PREFIX}cc
+-  fi
+-fi
++test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
++cc=${CC-${CROSS_PREFIX}gcc}
++
+ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in

diff --git a/make/libraries.mk b/make/libraries.mk
index 0d737acf946154d9332168c0b493614917ef2d25..51492b2a459d00c06651551318fdbc5e7bb71adb 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -310,6 +310,7 @@ $(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.xz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/zlib-$(ZLIB_VER).tar.xz
        set -e; cd $(BUILD_TMP)/zlib-$(ZLIB_VER) && \
+               $(PATCH)/zlib-1.2.12-fix-cc.patch && \
                $(PATCH)/zlib-ldflags-tests.patch && \
                $(PATCH)/zlib-remove.ldconfig.call.patch && \
                rm -rf config.cache && \