diff options
| author | tron <tron@pkgsrc.org> | 2001-01-13 01:33:20 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2001-01-13 01:33:20 +0000 |
| commit | e30dbaba4207d749a3c5974940908d8fe4fab4db (patch) | |
| tree | 60eb53a1de9cfa6bc37a839c30de3af3ec9f1852 /graphics/png | |
| parent | 7bd26976609093446bac300f7a1d74797f3a3469 (diff) | |
| download | pkgsrc-e30dbaba4207d749a3c5974940908d8fe4fab4db.tar.gz | |
Make this build if "${CC}" is not "cc".
Diffstat (limited to 'graphics/png')
| -rw-r--r-- | graphics/png/Makefile | 3 | ||||
| -rw-r--r-- | graphics/png/files/patch-sum | 4 | ||||
| -rw-r--r-- | graphics/png/patches/patch-aa | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index fec6dc04176..a80ee60cfe2 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/08/02 15:43:49 tron Exp $ +# $NetBSD: Makefile,v 1.24 2001/01/13 01:33:20 tron Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp DISTNAME= libpng-1.0.8 @@ -14,6 +14,7 @@ HOMEPAGE= http://www.cdrom.com/pub/png/ USE_LIBTOOL= yes MAKEFILE= scripts/makefile.std +MAKE_ENV+= REALCC=${CC} post-install: ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3 diff --git a/graphics/png/files/patch-sum b/graphics/png/files/patch-sum index 7866833b26f..4385d9b39ee 100644 --- a/graphics/png/files/patch-sum +++ b/graphics/png/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.7 2000/10/06 01:38:50 jlam Exp $ +$NetBSD: patch-sum,v 1.8 2001/01/13 01:33:20 tron Exp $ -MD5 (patch-aa) = 54940923f32359a14f738d34a7db807a +MD5 (patch-aa) = 85924495a5ec8934dd1879aa5241f4f3 diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa index a46898baf96..ba911286511 100644 --- a/graphics/png/patches/patch-aa +++ b/graphics/png/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.11 2000/10/06 01:38:51 jlam Exp $ +$NetBSD: patch-aa,v 1.12 2001/01/13 01:33:20 tron Exp $ --- scripts/makefile.std.orig Wed Dec 8 18:44:40 1999 +++ scripts/makefile.std @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.11 2000/10/06 01:38:51 jlam Exp $ -CC=cc -CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -+CC=${LIBTOOL} --mode=compile cc ++CC=${LIBTOOL} --mode=compile $(REALCC) +CFLAGS+=-O # -g -DPNG_DEBUG=5 +LDFLAGS=libpng.la -lz -lm @@ -35,12 +35,12 @@ $NetBSD: patch-aa,v 1.11 2000/10/06 01:38:51 jlam Exp $ - ar rc $@ $(OBJS) - $(RANLIB) $@ +libpng.la: $(OBJS) -+ ${LIBTOOL} --mode=link cc -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 1:3 ++ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 1:3 -pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) +pngtest: pngtest.o libpng.la -+ ${LIBTOOL} --mode=link cc -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) ++ ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) test: pngtest ./pngtest |