diff options
author | schwarz <schwarz@pkgsrc.org> | 2005-04-10 17:43:27 +0000 |
---|---|---|
committer | schwarz <schwarz@pkgsrc.org> | 2005-04-10 17:43:27 +0000 |
commit | b65e14d1c7db3a4dab64a68237f22cd4fa581bec (patch) | |
tree | 599de6df76911e7b76d63029e0939e69fc0c3ba3 /devel/zlib/patches | |
parent | 6712acbe9a2c6f9fbb3899244fb7ea46323cefda (diff) | |
download | pkgsrc-b65e14d1c7db3a4dab64a68237f22cd4fa581bec.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/patches')
-rw-r--r-- | devel/zlib/patches/patch-aa | 18 |
1 files changed, 8 insertions, 10 deletions
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) |