[Pkg-php-commits] [php/debian-sid] Pull (and fix broken patch) multiarch workaround from Ubuntu natty

[Ondřej Surý]

---
 debian/patches/series                              |    1 +
 .../temporary-path-fixes-for-multiarch.patch       |   68 ++++++++++++++++++++
 2 files changed, 69 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/temporary-path-fixes-for-multiarch.patch

diff --git a/debian/patches/series b/debian/patches/series
index 76f51d0..b212a2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -56,3 +56,4 @@ lp564920-fix-big-files.patch
 lang-test-use-utf8.patch
 disable_SSLv2_for_openssl_1_0_0.patch
 backport-upstream-lp592442.patch
+temporary-path-fixes-for-multiarch.patch
diff --git a/debian/patches/temporary-path-fixes-for-multiarch.patch b/debian/patches/temporary-path-fixes-for-multiarch.patch
new file mode 100644
index 0000000..b9b1d97
--- /dev/null
+++ b/debian/patches/temporary-path-fixes-for-multiarch.patch
@@ -0,0 +1,68 @@
+Description: transitional workaround for multiarch
+ As a stopgap for natty, patch the various config.m4 files for modules whose
+ libraries have moved to the multiarch dir; we can't use --with-libdir yet
+ because that requires all the build-deps to have moved.
+Author: Jonathan Marsden
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/739977
+Forwarded: not-needed
+Reviewed-by: Steve Langasek <steve.langasek at ubuntu.com>
+
+--- a/ext/dba/config.m4
++++ b/ext/dba/config.m4
+@@ -204,7 +204,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
+     AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
+   fi
+   for LIB in $2; do
+-    if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
++    if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/lib$LIB.$SHLIB_SUFFIX_NAME || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
+       lib_found="";
+       PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
+         AC_TRY_LINK([
+--- a/ext/gd/config.m4
++++ b/ext/gd/config.m4
+@@ -72,6 +72,7 @@ AC_DEFUN([PHP_GD_JPEG],[
+   if test "$PHP_JPEG_DIR" != "no"; then
+ 
+     for i in $PHP_JPEG_DIR /usr/local /usr; do
++      test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
+       test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
+     done
+ 
+@@ -97,6 +98,7 @@ AC_DEFUN([PHP_GD_PNG],[
+   if test "$PHP_PNG_DIR" != "no"; then
+ 
+     for i in $PHP_PNG_DIR /usr/local /usr; do
++      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
+       test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
+     done
+ 
+@@ -132,6 +134,7 @@ AC_DEFUN([PHP_GD_XPM],[
+   if test "$PHP_XPM_DIR" != "no"; then
+ 
+     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
++      test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+       test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+     done
+ 
+--- a/ext/pcre/config0.m4
++++ b/ext/pcre/config0.m4
+@@ -21,7 +21,7 @@ PHP_ARG_WITH(pcre-regex,,
+     AC_MSG_RESULT([$PCRE_INCDIR])
+ 
+     AC_MSG_CHECKING([for PCRE library location])
+-    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
++    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR/$DEB_HOST_MULTIARCH $PHP_PCRE_REGEX/$PHP_LIBDIR; do
+       test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
+     done
+     
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2271,7 +2271,7 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[
+     fi
+ 
+     for i in $PHP_KERBEROS; do
+-      if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then
++      if test -f $i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libkrb5.a; then
+         PHP_KERBEROS_DIR=$i
+         break
+       fi
-- 
1.7.1