SOURCES: php-link-libs.patch - ARGH. when changing LIBS instead of...

qboosh qboosh at pld-linux.org
Fri Dec 22 21:59:46 CET 2006


Author: qboosh                       Date: Fri Dec 22 20:59:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- ARGH. when changing LIBS instead of LDFLAGS, save/restore LIBS not LDFLAGS

---- Files affected:
SOURCES:
   php-link-libs.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/php-link-libs.patch
diff -u SOURCES/php-link-libs.patch:1.9 SOURCES/php-link-libs.patch:1.10
--- SOURCES/php-link-libs.patch:1.9	Thu Aug 10 09:18:37 2006
+++ SOURCES/php-link-libs.patch	Fri Dec 22 21:59:41 2006
@@ -28,14 +28,28 @@
    LDFLAGS=$_SAVE_LDFLAGS
 +  LIBS=$_SAVE_LIBS
  fi 
---- php.org/acinclude.m4~	2006-08-10 06:39:21.000000000 +0000
-+++ php/acinclude.m4	2006-08-10 06:58:46.933822750 +0000
-@@ -1745,7 +1745,7 @@
+--- php-5.2.0/acinclude.m4.orig	2006-12-22 21:52:13.766461055 +0100
++++ php-5.2.0/acinclude.m4	2006-12-22 21:52:37.159794165 +0100
+@@ -1740,18 +1740,18 @@
+ dnl Wrapper for AC_CHECK_LIB
+ dnl
+ AC_DEFUN([PHP_CHECK_LIBRARY], [
+-  save_old_LDFLAGS=$LDFLAGS
++  save_old_LIBS=$LIBS
+   ac_stuff="$5"
    
    save_ext_shared=$ext_shared
    ext_shared=yes
 -  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
 +  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
    AC_CHECK_LIB([$1],[$2],[
-     LDFLAGS=$save_old_LDFLAGS
+-    LDFLAGS=$save_old_LDFLAGS
++    LIBS=$save_old_LIBS
      ext_shared=$save_ext_shared
+     $3
+   ],[
+-    LDFLAGS=$save_old_LDFLAGS
++    LIBS=$save_old_LIBS
+     ext_shared=$save_ext_shared
+     unset ac_cv_lib_$1[]_$2
+     $4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-link-libs.patch?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list