Attachment 241639 Details for Bug 270985 – Honor CC & CFLAGS

[patch] Honor CC & CFLAGS

zip_fix-configure-and-CFLAGS.diff (text/plain), 2.15 KB, created by Eric Camachat on 2023-04-21 19:04:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Camachat

Created: 2023-04-21 19:04:57 UTC

Size: 2.15 KB

patch

obsolete

>diff --git archivers/zip/Makefile archivers/zip/Makefile
>index cb7eea6b3960..7f58ae319d82 100644
>--- archivers/zip/Makefile
>+++ archivers/zip/Makefile
>@@ -19,6 +19,7 @@ CPE_VENDOR=	info-zip_project
> 
> OPTIONS_DEFINE=	DOCS
> 
>+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
> MAKEFILE=	unix/Makefile
> ALL_TARGET=	generic
> 
>diff --git archivers/zip/files/patch-unix_configure archivers/zip/files/patch-unix_configure
>index 3e421f3ffba6..bcd7e875e2c6 100644
>--- archivers/zip/files/patch-unix_configure
>+++ 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

Actions: View | Diff

Attachments on bug 270985: 241639