SOURCES: libpng-norpath.patch - adapted for 1.2.21 version
lisu
lisu at pld-linux.org
Mon Oct 8 20:07:36 CEST 2007
Author: lisu Date: Mon Oct 8 18:07:36 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- adapted for 1.2.21 version
---- Files affected:
SOURCES:
libpng-norpath.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/libpng-norpath.patch
diff -u SOURCES/libpng-norpath.patch:1.3 SOURCES/libpng-norpath.patch:1.4
--- SOURCES/libpng-norpath.patch:1.3 Mon Apr 17 15:28:26 2006
+++ SOURCES/libpng-norpath.patch Mon Oct 8 20:07:31 2007
@@ -1,6 +1,6 @@
---- libpng-1.2.9/scripts/makefile.gcmmx.orig 2006-04-17 01:12:53.813611500 +0200
-+++ libpng-1.2.9/scripts/makefile.gcmmx 2006-04-17 01:13:47.872990000 +0200
-@@ -72,8 +72,8 @@
+--- libpng-1.2.21/scripts/makefile.gcmmx~ 2007-10-08 19:52:12.000000000 +0200
++++ libpng-1.2.21/scripts/makefile.gcmmx 2007-10-08 19:55:00.000000000 +0200
+@@ -70,8 +70,8 @@
# -m486 -malign-double -ffast-math \
# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
@@ -11,16 +11,16 @@
INCPATH=$(prefix)/include
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \
+ echo cppflags=\"-DPNG_THREAD_UNSAFE_OK \"; \
echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
+ echo R_opts=\"\"; \
echo libs=\"-lpng12 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
-@@ -239,7 +239,6 @@
+@@ -238,7 +238,6 @@
test-installed:
$(CC) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
@@ -28,8 +28,8 @@
-o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
./pngtesti pngtest.png
---- libpng-1.2.9/scripts/makefile.linux.orig 2006-04-17 01:12:53.813611500 +0200
-+++ libpng-1.2.9/scripts/makefile.linux 2006-04-17 01:14:15.322705500 +0200
+--- libpng-1.2.21/scripts/makefile.linux~ 2007-10-08 19:52:12.000000000 +0200
++++ libpng-1.2.21/scripts/makefile.linux 2007-10-08 19:56:43.000000000 +0200
@@ -50,8 +50,8 @@
CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
@@ -41,7 +41,7 @@
INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib
-@@ -98,7 +98,7 @@
+@@ -102,7 +102,7 @@
echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
echo L_opts=\"-L$(LIBPATH)\"; \
@@ -50,7 +50,7 @@
echo libs=\"-lpng12 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config
chmod +x libpng-config
-@@ -207,7 +207,6 @@
+@@ -214,7 +214,6 @@
test-installed:
$(CC) -I$(ZLIBINC) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libpng-norpath.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list