[Pkg-php-commits] [php/debian-sid] cherry-pick debian patches for libtool2.2.patch

[Raphael Geissert]

Make phpize copy and use the separate m4 files needed by libtool 2.2

phpize only knew about libtool.m4, but libtool 2.2 ships separate m4
files which are also required for the build process.  This lead to
FTBFS errors on extensions due to undefined macros.

and also:

fix syntax error in phpize5 caused by libtool2.2.patch

fix a typo in an if/fi block.
---
 debian/patches/libtool2.2.patch |   33 +++++++++++++++++++++++++++++++++
 debian/patches/series           |    1 +
 2 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/libtool2.2.patch

diff --git a/debian/patches/libtool2.2.patch b/debian/patches/libtool2.2.patch
new file mode 100644
index 0000000..7c5d6bb
--- /dev/null
+++ b/debian/patches/libtool2.2.patch
@@ -0,0 +1,33 @@
+Index: php/scripts/phpize.in
+===================================================================
+--- php.orig/scripts/phpize.in
++++ php/scripts/phpize.in
+@@ -5,10 +5,16 @@ prefix='@prefix@'
+ exec_prefix="`eval echo @exec_prefix@`"
+ phpdir="$prefix/lib/php5/build"
+ includedir="$prefix/include/php5"
++aclocaldir="$prefix/share/aclocal"
+ builddir="`pwd`"
+ SED="@SED@"
+ 
+-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 \
+@@ -126,8 +132,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()
diff --git a/debian/patches/series b/debian/patches/series
index 38039dd..efbb5af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
 002-static_openssl.patch
 004-ldap_fix.patch
 006-debian_quirks.patch
+libtool2.2.patch
 013-force_getaddrinfo.patch
 017-pread_pwrite_disable.patch
 019-z_off_t_as_long.patch
-- 
1.6.3.3