Contents of /trunk/libpng/patches/libpng-1.2.8-link_to_proper_libs-1.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2033 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 2033 byte(s)
-import
1 | Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org> |
2 | Date: 2004-08-05 |
3 | Initial Package Version: 1.2.6 |
4 | Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644 |
5 | Description: libpng is not linked against libz and libm. This causes |
6 | problems for packages that try to link against libpng |
7 | without including "-lz -lm" in the linker flags. |
8 | |
9 | $LastChangedBy: bdubbs $ |
10 | $Date: 2007-05-08 19:57:25 $ |
11 | |
12 | --- libpng-1.2.8/scripts/libpng.pc.in.orig 2005-01-04 14:06:54.182100728 +0000 |
13 | +++ libpng-1.2.8/scripts/libpng.pc.in 2005-01-04 14:07:19.108311368 +0000 |
14 | @@ -7,5 +7,5 @@ |
15 | Name: libpng12 |
16 | Description: Loads and saves PNG files |
17 | Version: 1.2.8 |
18 | -Libs: -L${libdir} -lpng12 -lz -lm |
19 | +Libs: -L${libdir} -lpng12 |
20 | Cflags: -I${includedir}/libpng12 |
21 | --- libpng-1.2.8/scripts/makefile.linux.orig 2005-01-04 14:07:37.875458328 +0000 |
22 | +++ libpng-1.2.8/scripts/makefile.linux 2005-01-04 14:11:03.918135080 +0000 |
23 | @@ -34,8 +34,9 @@ |
24 | CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ |
25 | $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 |
26 | |
27 | -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm |
28 | -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm |
29 | +LIBS=-lz -lm |
30 | +LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 |
31 | +LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS) |
32 | |
33 | RANLIB=ranlib |
34 | #RANLIB=echo |
35 | @@ -86,7 +87,7 @@ |
36 | echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ |
37 | echo L_opts=\"-L$(LIBPATH)\"; \ |
38 | echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \ |
39 | - echo libs=\"-lpng12 -lz -lm\"; \ |
40 | + echo libs=\"-lpng12\"; \ |
41 | cat scripts/libpng-config-body.in ) > libpng-config |
42 | chmod +x libpng-config |
43 | |
44 | @@ -99,12 +100,12 @@ |
45 | $(LIBNAME).so.$(PNGVER): $(OBJSDLL) |
46 | $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \ |
47 | -o $(LIBNAME).so.$(PNGVER) \ |
48 | - $(OBJSDLL) |
49 | + $(OBJSDLL) $(LIBS) |
50 | |
51 | libpng.so.3.$(PNGMIN): $(OBJSDLL) |
52 | $(CC) -shared -Wl,-soname,libpng.so.3 \ |
53 | -o libpng.so.3.$(PNGMIN) \ |
54 | - $(OBJSDLL) |
55 | + $(OBJSDLL) $(LIBS) |
56 | |
57 | pngtest: pngtest.o $(LIBNAME).so |
58 | $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) |