Date: Tue, 10 Dec 2024 17:48:28 GMT From: Larry Rosenman <ler@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fa3634bb050b - main - archivers/zip: honor CC & CFLAGS Message-ID: <202412101748.4BAHmSqq068250@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa3634bb050bdc7a84e29038c5533d9d1dca844f commit fa3634bb050bdc7a84e29038c5533d9d1dca844f Author: Larry Rosenman <ler@FreeBSD.org> AuthorDate: 2024-12-10 17:45:55 +0000 Commit: Larry Rosenman <ler@FreeBSD.org> CommitDate: 2024-12-10 17:48:25 +0000 archivers/zip: honor CC & CFLAGS and release maintainership PR: 270985 Reported by: Eric Camachat <eric@camachat.org> --- archivers/zip/Makefile | 5 ++-- archivers/zip/files/patch-unix_configure | 42 +++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index dcdc37d4787b..137affa64b28 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -1,11 +1,11 @@ PORTNAME= zip PORTVERSION= 3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} -MAINTAINER= ler@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Create/update ZIP files compatible with PKZIP WWW= https://infozip.sourceforge.net/Zip.html @@ -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 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412101748.4BAHmSqq068250>