r638 - trunk/libpng

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Sep 12 15:07:57 PDT 2004


Author: jim
Date: 2004-09-12 16:07:55 -0600 (Sun, 12 Sep 2004)
New Revision: 638

Added:
   trunk/libpng/libpng-1.2.7-link_to_proper_libs-1.patch
Log:
Added: libpng-1.2.7-link_to_proper_libs-1.patch

Added: trunk/libpng/libpng-1.2.7-link_to_proper_libs-1.patch
===================================================================
--- trunk/libpng/libpng-1.2.7-link_to_proper_libs-1.patch	2004-09-12 22:07:08 UTC (rev 637)
+++ trunk/libpng/libpng-1.2.7-link_to_proper_libs-1.patch	2004-09-12 22:07:55 UTC (rev 638)
@@ -0,0 +1,57 @@
+Submitted By: Oliver Brakmann <obrakmann at gmx.net>
+Date: 2004-08-04
+Initial Package Version: 1.2.7
+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.
+
+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 patches mailing list