diff options
| author | jschauma <jschauma> | 2004-05-26 03:20:38 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2004-05-26 03:20:38 +0000 |
| commit | e4fd1b441b4b2d76d7765478da11d56f03c94652 (patch) | |
| tree | c633815db5fbd7a716a80a9793785e61dfbcf28c /devel/zlib | |
| parent | 73f9b1773c85a662a8d7248c81a7c2d4e595973f (diff) | |
| download | pkgsrc-e4fd1b441b4b2d76d7765478da11d56f03c94652.tar.gz | |
Use CFLAGS when creating the archive. This fixes building under IRIX64
using gcc, as we need the ABI specific flags.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/distinfo | 4 | ||||
| -rw-r--r-- | devel/zlib/patches/patch-aa | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo index f4cb8eb9ac5..0c8c8d473e7 100644 --- a/devel/zlib/distinfo +++ b/devel/zlib/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2004/05/08 01:06:26 tv Exp $ +$NetBSD: distinfo,v 1.8 2004/05/26 03:20:38 jschauma Exp $ SHA1 (zlib-1.2.1.tar.gz) = a3d51efc98b87b9ebd1a528d726007b0cb08a612 Size (zlib-1.2.1.tar.gz) = 345833 bytes -SHA1 (patch-aa) = e7ed32531a8002792dd62eac4d8522dbf7d224a5 +SHA1 (patch-aa) = 98ad332ebd33ab7eaa4fc8ee9a4b9269ba823b49 diff --git a/devel/zlib/patches/patch-aa b/devel/zlib/patches/patch-aa index 9e6b7dc633b..1e9f652c3f9 100644 --- a/devel/zlib/patches/patch-aa +++ b/devel/zlib/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 2004/05/08 01:06:26 tv Exp $ +$NetBSD: patch-aa,v 1.7 2004/05/26 03:20:38 jschauma Exp $ ---- Makefile.in.orig 2003-11-09 02:29:23.000000000 +0000 -+++ Makefile.in +--- Makefile.in.orig 2003-11-08 21:29:23.000000000 -0500 ++++ Makefile.in 2004-05-25 23:07:04.000000000 -0400 @@ -16,9 +16,7 @@ # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2004/05/08 01:06:26 tv Exp $ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -@@ -54,7 +52,6 @@ OBJA = +@@ -54,7 +52,6 @@ TEST_OBJS = example.o minigzip.o @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.6 2004/05/08 01:06:26 tv Exp $ check: test test: all -@@ -77,11 +74,11 @@ match.o: match.S +@@ -77,11 +74,11 @@ mv _match.o match.o rm -f _match.s @@ -30,14 +30,14 @@ $NetBSD: patch-aa,v 1.6 2004/05/08 01:06:26 tv Exp $ - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) +all: $(OBJS) -+ ${LIBTOOL} --mode=link ${CC} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2 ++ ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o libz.la ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:2 + +.c.o: + ${LIBTOOL} --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS} -c $< example$(EXE): example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -@@ -90,6 +87,11 @@ minigzip$(EXE): minigzip.o $(LIBS) +@@ -90,6 +87,11 @@ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) |