summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2015-08-28 08:17:38 +0000
committerrichard <richard@pkgsrc.org>2015-08-28 08:17:38 +0000
commit0229321d9d0d973ad92ce0a0d4c98fcdccd53a68 (patch)
tree129fb1a67b39728cdd9075ba99c1ac7b74b33deb /archivers
parent211395412584c52adf981921872e626ec0f138df (diff)
downloadpkgsrc-0229321d9d0d973ad92ce0a0d4c98fcdccd53a68.tar.gz
patch to let SunOS, other than sunpro compilers, use assembler.
The problem is more the ilk of the cpp installed.. bump PKGREVISION
Diffstat (limited to 'archivers')
-rw-r--r--archivers/zip/Makefile6
-rw-r--r--archivers/zip/distinfo4
-rw-r--r--archivers/zip/patches/patch-ab21
3 files changed, 25 insertions, 6 deletions
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 3cdcc243e4b..6a33ce8dc56 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2014/10/09 14:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2015/08/28 08:17:38 richard Exp $
DISTNAME= zip30
PKGNAME= zip-3.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/
EXTRACT_SUFX= .tgz
@@ -32,7 +32,7 @@ BUILD_TARGET= generic
CFLAGS+= -O
.endif
-.if !empty(PKGSRC_COMPILER:Msunpro) || ${OPSYS} == "SunOS"
+.if !empty(PKGSRC_COMPILER:Msunpro)
MAKE_FLAGS+= DISABLE_ASM=YES
.endif
diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo
index 1cb230ed3d2..b25de717a61 100644
--- a/archivers/zip/distinfo
+++ b/archivers/zip/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2013/04/16 10:49:31 adam Exp $
+$NetBSD: distinfo,v 1.15 2015/08/28 08:17:38 richard Exp $
SHA1 (zip30.tgz) = c9f4099ecf2772b53c2dd4a8e508064ce015d182
RMD160 (zip30.tgz) = 1fc99daf3e36494ba392c7514a714fe3d258d232
Size (zip30.tgz) = 1118845 bytes
SHA1 (patch-aa) = e9fc1d2801cb4e0e193c6378bcf0ffbc8dfb3bd3
-SHA1 (patch-ab) = e294e3a485364c92a1799ea18c9f1cb296e9d09d
+SHA1 (patch-ab) = 9b5e62be5f7e6d2e4640ade5bf8c469681e6246f
diff --git a/archivers/zip/patches/patch-ab b/archivers/zip/patches/patch-ab
index b1162342c94..d470a5be436 100644
--- a/archivers/zip/patches/patch-ab
+++ b/archivers/zip/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2013/04/16 10:49:31 adam Exp $
+$NetBSD: patch-ab,v 1.7 2015/08/28 08:17:38 richard Exp $
Use CPPFLAGS during configuration.
Don't force compiler optimization flags.
@@ -26,6 +26,25 @@ Introduce DISABLE_ASM
# bzip2
+@@ -221,12 +217,12 @@ echo Check for the C preprocessor
+ # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
+ CPP="${CC} -E"
+ # solaris as(1) needs -P, maybe others as well ?
+-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+-[ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+-[ -f /xenix ] && CPP="${CC} -E"
+-[ -f /lynx.os ] && CPP="${CC} -E"
++#[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
++#[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
++#[ -f /lib/cpp ] && CPP=/lib/cpp
++#[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
++#[ -f /xenix ] && CPP="${CC} -E"
++#[ -f /lynx.os ] && CPP="${CC} -E"
+
+ echo "#include <stdio.h>" > conftest.c
+ $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
@@ -235,6 +231,7 @@ $CPP conftest.c >/dev/null 2>/dev/null |
echo Check if we can use asm code
OBJA=""