diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-03-18 21:53:29 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-03-18 21:53:29 +0000 |
| commit | 291ecdb5f0bb0374ce3cb55e5feda841f3473735 (patch) | |
| tree | 9764ed92c4b1102b56dfafb21f3a027eb17c4c3c /archivers | |
| parent | 07ada1cbd555bf9ccc932233dfa50af3f66baff2 (diff) | |
| download | pkgsrc-291ecdb5f0bb0374ce3cb55e5feda841f3473735.tar.gz | |
Make this compile on Irix with the MIPSPro compiler by removing gcc-only
CFLAGS from a patch iff CC is not gcc.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/bzip2/Makefile | 12 | ||||
| -rw-r--r-- | archivers/bzip2/distinfo | 4 | ||||
| -rw-r--r-- | archivers/bzip2/patches/patch-aa | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 0561a2d7a60..d224d50e9ef 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2002/10/31 22:08:15 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/03/18 21:53:29 jschauma Exp $ # DISTNAME= bzip2-1.0.2 @@ -13,6 +13,16 @@ USE_BUILDLINK2= # defined USE_LIBTOOL= # defined MAKE_ENV+= REALCC="${BUILDLINK_CC}" +.include "../../mk/bsd.prefs.mk" + +CCVERS!= ${CC} -v 2>&1 | ${GREP} "gcc" || ${ECHO} "notgcc" + +.if ${CCVERS} != "notgcc" +BZIP_CFLAGS= -Wall -Winline -fomit-frame-pointer -fno-strength-reduce +.endif + +MAKE_ENV+= BZIP_CFLAGS="${BZIP_CFLAGS}" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin ${LN} -f ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2 diff --git a/archivers/bzip2/distinfo b/archivers/bzip2/distinfo index 0154776515c..997962a0942 100644 --- a/archivers/bzip2/distinfo +++ b/archivers/bzip2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/03/24 14:02:36 mjl Exp $ +$NetBSD: distinfo,v 1.7 2003/03/18 21:53:29 jschauma Exp $ SHA1 (bzip2-1.0.2.tar.gz) = d47793959c0d65a4d7246e0247ed1358662d9ebf Size (bzip2-1.0.2.tar.gz) = 665198 bytes -SHA1 (patch-aa) = 41c6eb68818a6d2e81ea53830727fe421fcae125 +SHA1 (patch-aa) = 96899bad1878fbd0c556c0830d8a7a71ce724fc9 diff --git a/archivers/bzip2/patches/patch-aa b/archivers/bzip2/patches/patch-aa index ee45c4a6ff3..2ee6609cc50 100644 --- a/archivers/bzip2/patches/patch-aa +++ b/archivers/bzip2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2002/03/24 14:02:36 mjl Exp $ +$NetBSD: patch-aa,v 1.6 2003/03/18 21:53:30 jschauma Exp $ --- Makefile.orig Sat Jan 26 00:34:53 2002 +++ Makefile Sun Mar 24 14:56:33 2002 @@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.5 2002/03/24 14:02:36 mjl Exp $ -# Where you want it installed when you do 'make install' -PREFIX=/usr - -+CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES) ++CFLAGS+=${BZIP_CFLAGS} $(BIGFILES) OBJS= blocksort.o \ huffman.o \ |