summaryrefslogtreecommitdiff
path: root/archivers/zip/files/patch-unix_configure
diff options
context:
space:
mode:
authorLarry Rosenman <ler@FreeBSD.org>2024-12-10 11:45:55 -0600
committerLarry Rosenman <ler@FreeBSD.org>2024-12-10 11:48:25 -0600
commitfa3634bb050bdc7a84e29038c5533d9d1dca844f (patch)
tree87a90d7b0ea9b059279548c1d758138da7824ed4 /archivers/zip/files/patch-unix_configure
parentsecurity/osv-scanner: Update to 1.9.1 (diff)
archivers/zip: honor CC & CFLAGS
and release maintainership PR: 270985 Reported by: Eric Camachat <eric@camachat.org>
Diffstat (limited to 'archivers/zip/files/patch-unix_configure')
-rw-r--r--archivers/zip/files/patch-unix_configure42
1 files changed, 41 insertions, 1 deletions
diff --git a/archivers/zip/files/patch-unix_configure b/archivers/zip/files/patch-unix_configure
index 3e421f3ffba6..bcd7e875e2c6 100644
--- a/archivers/zip/files/patch-unix_configure
+++ b/archivers/zip/files/patch-unix_configure
@@ -24,7 +24,7 @@
[ -f /xenix ] && CPP="${CC} -E"
[ -f /lynx.os ] && CPP="${CC} -E"
-@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/
+@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/null"; then
echo "int foo() { return 0;}" > conftest.c
$CC -c conftest.c >/dev/null 2>/dev/null
echo Check if compiler generates underlines
@@ -33,3 +33,43 @@
[ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
+@@ -519,7 +516,10 @@ done
+
+
+ echo Check for memset
+-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
++cat > conftest.c << _EOF_
++#include <string.h>
++int main(){ char k; memset(&k,0,0); return 0; }
++_EOF_
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
+
+@@ -556,6 +556,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+
+ echo Check for directory libraries
+ cat > conftest.c << _EOF_
++#include <dirent.h>
+ int main() { return closedir(opendir(".")); }
+ _EOF_
+
+@@ -578,7 +579,10 @@ fi
+ # Dynix/ptx 1.3 needed this
+
+ echo Check for readlink
+-echo "int main(){ return readlink(); }" > conftest.c
++cat > conftest.c << _EOF_
++#include <unistd.h>
++int main() { return readlink(); }
++_EOF_
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+ $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
+@@ -621,6 +625,7 @@ CFLAGS="${CFLAGS} ${OPT}"
+
+ echo Check for valloc
+ cat > conftest.c << _EOF_
++#include <unistd.h>
+ main()
+ {
+ #ifdef MMAP