X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-libtool.patch;h=380cd0aaba7d1672c854c8319856a6900c43baaf;hb=5d664fb81d457361ba886878662b23ff3916843e;hp=0a06d48aa844ccbb5c2b15fe8cda563c1a80de11;hpb=dadaac17a90d53a385a4af3ec357daacd39ba56b;p=packages%2Fphp.git

diff --git a/php-libtool.patch b/php-libtool.patch
index 0a06d48..380cd0a 100644
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,21 +1,20 @@
---- php-4.3.0/acinclude.m4.orig	Sun Nov 17 20:28:57 2002
-+++ php-4.3.0/acinclude.m4	Fri Jan  3 09:59:15 2003
-@@ -838,13 +838,13 @@
- dnl
- AC_DEFUN([PHP_BUILD_PROGRAM],[
-   OVERALL_TARGET=[]ifelse($1,,php,$1)
--  php_c_pre='$(CC)'
-+  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
--  php_c_post=' && echo > $[@]'
--  php_cxx_pre='$(CXX)'
-+  php_c_post=
-+  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
--  php_cxx_post=' && echo > $[@]'
--  php_lo=o
-+  php_cxx_post=
-+  php_lo=lo
-   
-   shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-   shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic'
+--- php/scripts/phpize.in.org	2008-06-16 10:03:28.882568639 +0200
++++ php/scripts/phpize.in	2008-06-16 10:04:37.424018256 +0200
+@@ -8,7 +8,7 @@
+ builddir="`pwd`"
+ SED="@SED@"
+ 
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+ FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
+ CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
+ 	mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+@@ -127,7 +127,7 @@
+  
+   (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
+   (cd "$phpdir" && cp $FILES "$builddir")
+-  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
++  (cd "$builddir" && cat acinclude.m4 ./build/{libtool,lt~obsolete,ltoptions,ltsugar,ltversion}.m4 > aclocal.m4)
+ }
+ 
+ phpize_replace_prefix()