SOURCES: libpng-norpath.patch - don't pass hardcoded -L/usr/lib (i...

[pluto]

Author: pluto                        Date: Mon Apr 17 13:28:31 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't pass hardcoded -L/usr/lib (it breaks 64-bit build).

---- Files affected:
SOURCES:
   libpng-norpath.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/libpng-norpath.patch
diff -u SOURCES/libpng-norpath.patch:1.2 SOURCES/libpng-norpath.patch:1.3
--- SOURCES/libpng-norpath.patch:1.2	Mon Apr 17 02:22:01 2006
+++ SOURCES/libpng-norpath.patch	Mon Apr 17 15:28:26 2006
@@ -6,8 +6,8 @@
  
 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
-+LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
++LDFLAGS=-L. -lpng12 -lz -lm
++LDFLAGS_A=libpng.a -lz -lm
  
  
  INCPATH=$(prefix)/include
@@ -20,12 +20,11 @@
  	echo libs=\"-lpng12 -lz -lm\"; \
  	cat scripts/libpng-config-body.in ) > libpng-config
  	chmod +x libpng-config
-@@ -239,7 +239,7 @@
+@@ -239,7 +239,6 @@
  test-installed:
  	$(CC) -I$(ZLIBINC) \
  	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
 -	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-+	   -L$(ZLIBLIB) \
  	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
  	./pngtesti pngtest.png
  
@@ -37,8 +36,8 @@
  
 -LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
 -LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
-+LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
++LDFLAGS=-L. -lpng12 -lz -lm
++LDFLAGS_A=libpng.a -lz -lm
  
  INCPATH=$(prefix)/include
  LIBPATH=$(exec_prefix)/lib
@@ -51,12 +50,11 @@
  	echo libs=\"-lpng12 -lz -lm\"; \
  	cat scripts/libpng-config-body.in ) > libpng-config
  	chmod +x libpng-config
-@@ -207,7 +207,7 @@
+@@ -207,7 +207,6 @@
  test-installed:
  	$(CC) -I$(ZLIBINC) \
  	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
 -	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-+	   -L$(ZLIBLIB) \
  	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
  	./pngtesti pngtest.png
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libpng-norpath.patch?r1=1.2&r2=1.3&f=u