r2767 - trunk/patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Tue Oct 5 18:35:42 PDT 2004


Author: igor
Date: 2004-10-05 19:35:39 -0600 (Tue, 05 Oct 2004)
New Revision: 2767

Added:
   trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch
Removed:
   trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch
Log:
Updated libpng patch version.

Deleted: trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch
===================================================================
--- trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch	2004-10-06 01:32:45 UTC (rev 2766)
+++ trunk/patches/libpng-1.2.6-link_to_proper_libs-1.patch	2004-10-06 01:35:39 UTC (rev 2767)
@@ -1,60 +0,0 @@
-Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
-Date: 2004-08-05
-Initial Package Version: 1.2.6
-Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
-Description: libpng is not linked against libz and libm. This causes problems
-for packages that try to link against libpng without including "-lz -lm" in
-the linker flags.
-
-$LastChangedBy$
-$Date$
-
-diff -ur libpng-1.2.6rc1.orig/scripts/libpng.pc.in libpng-1.2.6rc1/scripts/libpng.pc.in
---- libpng-1.2.6rc1.orig/scripts/libpng.pc.in	2002-10-03 06:32:33.000000000 -0500
-+++ libpng-1.2.6rc1/scripts/libpng.pc.in	2004-03-14 10:29:13.000000000 -0600
-@@ -7,5 +7,5 @@
- Name: libpng12
- Description: Loads and saves PNG files
- Version: 1.2.7
--Libs: -L${libdir} -lpng12 -lz -lm
-+Libs: -L${libdir} -lpng12
- Cflags: -I${includedir}/libpng12
-diff -ur libpng-1.2.6rc1.orig/scripts/makefile.linux libpng-1.2.6rc1/scripts/makefile.linux
---- libpng-1.2.6rc1.orig/scripts/makefile.linux	2002-10-03 06:32:34.000000000 -0500
-+++ libpng-1.2.6rc1/scripts/makefile.linux	2004-03-14 10:31:21.000000000 -0600
-@@ -34,8 +34,9 @@
- CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
- 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
--LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
--LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LIBS=-lz -lm
-+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
-+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
- 
- RANLIB=ranlib
- #RANLIB=echo
-@@ -86,7 +87,7 @@
- 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- 	echo L_opts=\"-L$(LIBPATH)\"; \
- 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
--	echo libs=\"-lpng12 -lz -lm\"; \
-+	echo libs=\"-lpng12\"; \
- 	cat scripts/libpng-config-body.in ) > libpng-config
- 	chmod +x libpng-config
- 
-@@ -99,12 +100,12 @@
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
- 	-o $(LIBNAME).so.$(PNGVER) \
--	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- libpng.so.3.$(PNGMIN): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,libpng.so.3 \
- 	-o libpng.so.3.$(PNGMIN) \
--	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- pngtest: pngtest.o $(LIBNAME).so
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)

Added: trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch
===================================================================
--- trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch	2004-10-06 01:32:45 UTC (rev 2766)
+++ trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch	2004-10-06 01:35:39 UTC (rev 2767)
@@ -0,0 +1,60 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch.org>
+Date: 2004-08-05
+Initial Package Version: 1.2.6
+Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
+Description: libpng is not linked against libz and libm. This causes problems
+for packages that try to link against libpng without including "-lz -lm" in
+the linker flags.
+
+$LastChangedBy: igor $
+$Date: 2004-10-06 03:32:45 +0200 (Wed, 06 Oct 2004) $
+
+diff -ur libpng-1.2.6rc1.orig/scripts/libpng.pc.in libpng-1.2.6rc1/scripts/libpng.pc.in
+--- libpng-1.2.6rc1.orig/scripts/libpng.pc.in	2002-10-03 06:32:33.000000000 -0500
++++ libpng-1.2.6rc1/scripts/libpng.pc.in	2004-03-14 10:29:13.000000000 -0600
+@@ -7,5 +7,5 @@
+ Name: libpng12
+ Description: Loads and saves PNG files
+ Version: 1.2.7
+-Libs: -L${libdir} -lpng12 -lz -lm
++Libs: -L${libdir} -lpng12
+ Cflags: -I${includedir}/libpng12
+diff -ur libpng-1.2.6rc1.orig/scripts/makefile.linux libpng-1.2.6rc1/scripts/makefile.linux
+--- libpng-1.2.6rc1.orig/scripts/makefile.linux	2002-10-03 06:32:34.000000000 -0500
++++ libpng-1.2.6rc1/scripts/makefile.linux	2004-03-14 10:31:21.000000000 -0600
+@@ -34,8 +34,9 @@
+ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+ 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
+ 
+-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
+-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
++LIBS=-lz -lm
++LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
++LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
+ 
+ RANLIB=ranlib
+ #RANLIB=echo
+@@ -86,7 +87,7 @@
+ 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ 	echo L_opts=\"-L$(LIBPATH)\"; \
+ 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
+-	echo libs=\"-lpng12 -lz -lm\"; \
++	echo libs=\"-lpng12\"; \
+ 	cat scripts/libpng-config-body.in ) > libpng-config
+ 	chmod +x libpng-config
+ 
+@@ -99,12 +100,12 @@
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
+ 	-o $(LIBNAME).so.$(PNGVER) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ libpng.so.3.$(PNGMIN): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,libpng.so.3 \
+ 	-o libpng.so.3.$(PNGMIN) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+ 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)




More information about the blfs-book mailing list