sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

archivers/zip: honor CC & CFLAGS

Browse source 
and release maintainership

PR:	270985
Reported by: Eric Camachat <eric@camachat.org>
This commit is contained in:
Larry Rosenman 2024-12-10 11:45:55 -06:00
parent a78f1bc536
commit fa3634bb05
No known key found for this signature in database
GPG key ID: 697C99B1AB48A77D
2 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
archivers/zip/Makefile
View file

@ -1,11 +1,11 @@
PORTNAME= zip PORTNAME= zip
PORTVERSION= 3.0 PORTVERSION= 3.0
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= archivers CATEGORIES= archivers
MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION} MASTER_SITES= SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= ler@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Create/update ZIP files compatible with PKZIP COMMENT= Create/update ZIP files compatible with PKZIP
WWW= https://infozip.sourceforge.net/Zip.html WWW= https://infozip.sourceforge.net/Zip.html
@ -19,6 +19,7 @@ CPE_VENDOR= info-zip_project
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
MAKEFILE= unix/Makefile MAKEFILE= unix/Makefile
ALL_TARGET= generic ALL_TARGET= generic

42
archivers/zip/files/patch-unix_configure
View file

@ -24,7 +24,7 @@
[ -f /xenix ] && CPP="${CC} -E" [ -f /xenix ] && CPP="${CC} -E"
[ -f /lynx.os ] && 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 echo "int foo() { return 0;}" > conftest.c
$CC -c conftest.c >/dev/null 2>/dev/null $CC -c conftest.c >/dev/null 2>/dev/null
echo Check if compiler generates underlines echo Check if compiler generates underlines
@ -33,3 +33,43 @@
[ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE" [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then 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 ] 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