moved C: logrotate to proper subpackage (containing logrotate file)

[packages/php.git] / php-libtool.patch

diff --git a/php-libtool.patch b/php-libtool.patch
index f085be46f17d048e32e0f52d50c57c4fad8e6e7d..f9713d808e36cefd94bf442e9e1ebef78278d5e5 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,22 +1,31 @@
-diff -burN php-5.0.4RC1.orig/acinclude.m4 php-5.0.4RC1/acinclude.m4
---- php-5.0.4RC1.orig/acinclude.m4     2005-03-15 18:02:27.869258184 +0100
-+++ php-5.0.4RC1/acinclude.m4  2005-03-15 18:04:34.037077760 +0100
-@@ -779,13 +779,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
+--- php-5.4.6/scripts/phpize.in~       2012-08-23 03:02:42.000000000 +0300
++++ php-5.4.6/scripts/phpize.in        2012-08-23 10:16:37.011306948 +0300
+@@ -6,10 +6,16 @@
+ exec_prefix="`eval echo @exec_prefix@`"
+ phpdir="`eval echo @libdir@`/php/build"
+ includedir="`eval echo @includedir@`/php"
++aclocaldir="$prefix/share/aclocal"
+ builddir="`pwd`"
+ SED="@SED@"
  
-   case $with_pic in
-     yes) pic_setting='-prefer-pic';;
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
++if [ -f "$aclocaldir/ltsugar.m4" ]; then
++    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
++else
++    LIBTOOL_FILES="libtool.m4"
++fi
+ 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 \
+@@ -145,8 +151,9 @@ phpize_copy_files()
+   test -d build || mkdir build
+  
+   (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
++  (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build)
+   (cd "$phpdir" && cp $FILES "$builddir")
+-  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
++  (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4)
+ }
+ 
+ phpize_replace_prefix()