diff options
| author | schwarz <schwarz> | 2005-04-10 17:43:27 +0000 |
|---|---|---|
| committer | schwarz <schwarz> | 2005-04-10 17:43:27 +0000 |
| commit | e84bceb77762e9c5df2365c925f15bd43fea9d2d (patch) | |
| tree | 599de6df76911e7b76d63029e0939e69fc0c3ba3 /devel/zlib | |
| parent | d9a633dd9a477fb200ffd2592480a1c6548c2b49 (diff) | |
| download | pkgsrc-e84bceb77762e9c5df2365c925f15bd43fea9d2d.tar.gz | |
prevent patch-aa from elimiating CFLAGS= from Makefile.in. This enables
configure to pass the CFLAGS it has determined which would otherwise get
ignored. Pkgsrc CFLAGS are taken into account by configure already.
Change approved by recht.
Diffstat (limited to 'devel/zlib')
| -rw-r--r-- | devel/zlib/distinfo | 4 | ||||
| -rw-r--r-- | devel/zlib/patches/patch-aa | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/devel/zlib/distinfo b/devel/zlib/distinfo index 864da226997..00d6dcd33ac 100644 --- a/devel/zlib/distinfo +++ b/devel/zlib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2005/02/23 22:24:35 agc Exp $ +$NetBSD: distinfo,v 1.12 2005/04/10 17:43:27 schwarz Exp $ SHA1 (zlib-1.2.2.tar.gz) = e6ec67108bfd1f321eb4f1bd192b648725219595 RMD160 (zlib-1.2.2.tar.gz) = 374a85839d821c75f5630c7effd7f7e2047f67bb Size (zlib-1.2.2.tar.gz) = 430469 bytes -SHA1 (patch-aa) = 98ad332ebd33ab7eaa4fc8ee9a4b9269ba823b49 +SHA1 (patch-aa) = d3edeb170bf192ca986b00bc984b0de3487068b9 diff --git a/devel/zlib/patches/patch-aa b/devel/zlib/patches/patch-aa index 1e9f652c3f9..a7f6d0c43ff 100644 --- a/devel/zlib/patches/patch-aa +++ b/devel/zlib/patches/patch-aa @@ -1,18 +1,16 @@ -$NetBSD: patch-aa,v 1.7 2004/05/26 03:20:38 jschauma Exp $ +$NetBSD: patch-aa,v 1.8 2005/04/10 17:43:27 schwarz Exp $ ---- 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 @@ +--- Makefile.in.orig 2004-09-15 16:27:20.000000000 +0200 ++++ Makefile.in 2005-04-10 12:48:19.000000000 +0200 +@@ -16,7 +16,6 @@ # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME -CC=cc --CFLAGS=-O + CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 - #CFLAGS=-g -DDEBUG - #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -@@ -54,7 +52,6 @@ +@@ -54,7 +53,6 @@ TEST_OBJS = example.o minigzip.o @@ -20,7 +18,7 @@ $NetBSD: patch-aa,v 1.7 2004/05/26 03:20:38 jschauma Exp $ check: test test: all -@@ -77,11 +74,11 @@ +@@ -77,11 +75,11 @@ mv _match.o match.o rm -f _match.s @@ -37,7 +35,7 @@ $NetBSD: patch-aa,v 1.7 2004/05/26 03:20:38 jschauma Exp $ example$(EXE): example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -@@ -90,6 +87,11 @@ +@@ -90,6 +88,11 @@ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) |