From: bszx <bszx@pld-linux.org>
Date: Fri, 17 Nov 2000 17:45:39 +0000 (+0000)
Subject: - fix passing $RPM_OPT_FLAGS in makefile.gcmmx too
X-Git-Tag: libpng-1_0_8-4~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-libpng.git;a=commitdiff_plain;h=bca8f0782fb287e7742976b6f401103d5bc504a2

- fix passing $RPM_OPT_FLAGS in makefile.gcmmx too

Changed files:
    libpng-opt.patch -> 1.3
---

diff --git a/libpng-opt.patch b/libpng-opt.patch
index 392206a..e12c4f4 100644
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -22,4 +22,27 @@ diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.
 +	$(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5
  LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
  
+ RANLIB=ranlib
+--- libpng-1.0.8/scripts/makefile.gcmmx.old	Mon Jul 24 13:34:14 2000
++++ libpng-1.0.8/scripts/makefile.gcmmx	Wed Nov  1 13:29:17 2000
+@@ -13,8 +13,8 @@
+ # Where the zlib library and include files are located
+ #ZLIBLIB=/usr/local/lib
+ #ZLIBINC=/usr/local/include
+-ZLIBLIB=../zlib
+-ZLIBINC=../zlib
++ZLIBLIB=/usr/lib
++ZLIBINC=
+ 
+ ALIGN=
+ # for i386:
+@@ -26,8 +26,7 @@
+ 
+ # for pgcc version 2.95.1, -O3 is buggy; don't use it.
+ 
+-CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
+-        -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
++CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(RPM_OPT_FLAGS) $(ALIGN) -funroll-loops 
+ LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
+ 
  RANLIB=ranlib