diff options
| author | adam <adam@pkgsrc.org> | 2013-04-16 10:49:31 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-04-16 10:49:31 +0000 |
| commit | d892944e4b411a2a342031aa444f42f2febacc69 (patch) | |
| tree | 041fbc6e5dcd460b9ee4bf690f9a8659afd8a537 | |
| parent | a80cdba1864129510efddcb9e258d1e0f817c3f9 (diff) | |
| download | pkgsrc-d892944e4b411a2a342031aa444f42f2febacc69.tar.gz | |
Use CPPFLAGS in configure script: needed on Mac OS X to make use of -isysroot
| -rw-r--r-- | archivers/zip/distinfo | 4 | ||||
| -rw-r--r-- | archivers/zip/patches/patch-ab | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo index 1b71697c046..1cb230ed3d2 100644 --- a/archivers/zip/distinfo +++ b/archivers/zip/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2012/09/07 12:57:14 adam Exp $ +$NetBSD: distinfo,v 1.14 2013/04/16 10:49:31 adam Exp $ SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182 RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232 Size (zip30.tgz) = 1118845 bytes SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3 -SHA1 (patch-ab) = 9fe46894b9098800d02b964c5d5817d1531e9909 +SHA1 (patch-ab) = e294e3a485364c92a1799ea18c9f1cb296e9d09d diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab index 1ba2591422c..b1162342c94 100644 --- a/archivers/zip/patches/patch-ab +++ b/archivers/zip/patches/patch-ab @@ -1,10 +1,20 @@ -$NetBSD: patch-ab,v 1.5 2012/09/07 12:57:14 adam Exp $ +$NetBSD: patch-ab,v 1.6 2013/04/16 10:49:31 adam Exp $ +Use CPPFLAGS during configuration. Don't force compiler optimization flags. Introduce DISABLE_ASM --- unix/configure.orig 2008-06-20 03:32:20.000000000 +0000 +++ unix/configure +@@ -16,7 +16,7 @@ + + trap "rm -f conftest* core a.out; exit 1" 1 2 3 15 + +-CC=${1-cc} ++CC="${1-cc} $CPPFLAGS" + CFLAGS=${2-"-I. -DUNIX"} + LFLAGS1='' + LFLAGS2='' @@ -118,10 +118,6 @@ _EOF_ fi @@ -16,7 +26,7 @@ Introduce DISABLE_ASM # bzip2 -@@ -235,6 +233,7 @@ $CPP conftest.c >/dev/null 2>/dev/null | +@@ -235,6 +231,7 @@ $CPP conftest.c >/dev/null 2>/dev/null | echo Check if we can use asm code OBJA="" OCRCU8="" @@ -24,7 +34,7 @@ Introduce DISABLE_ASM if eval "$CPP match.S > _match.s 2>/dev/null"; then if test ! -s _match.s || grep error < _match.s > /dev/null; then : -@@ -257,6 +256,7 @@ if eval "$CPP match.S > _match.s 2>/dev/ +@@ -257,6 +254,7 @@ if eval "$CPP match.S > _match.s 2>/dev/ fi fi rm -f _match.s _match.o _crc_i386.s _crc_i386.o |