temporary-path-fixes-for-multiarch

Gbp-Pq: Name 0015-temporary-path-fixes-for-multiarch.patch

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 79136d526a161b0d55fa64cf379a6b6420b8bf6f..bbd6bad328d8298012976c9de59042588d5e5ae9 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -302,7 +302,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_LINK_IFELSE([AC_LANG_PROGRAM([[

diff --git a/ext/gmp/config.m4 b/ext/gmp/config.m4
index fa55751cf166009a1a74d9056bddd9f548102d4c..1efacd8e45999d7f0040c17d162950c8469cf9da 100644 (file)
--- a/ext/gmp/config.m4
+++ b/ext/gmp/config.m4
@@ -12,7 +12,7 @@ if test "$PHP_GMP" != "no"; then
 
     PHP_ADD_LIBRARY(gmp,,GMP_SHARED_LIBADD)
   else
-    if test ! -f $PHP_GMP/include/gmp.h; then
+    if test ! -f $PHP_GMP/include/gmp.h -a test ! -f $PHP_GMP/$DEB_HOST_MULTIARCH/include/gmp.h; then
       AC_MSG_ERROR(Unable to locate gmp.h)
     fi
 
@@ -25,6 +25,7 @@ if test "$PHP_GMP" != "no"; then
 
     PHP_ADD_LIBRARY_WITH_PATH(gmp, $PHP_GMP/$PHP_LIBDIR, GMP_SHARED_LIBADD)
     PHP_ADD_INCLUDE($PHP_GMP/include)
+    PHP_ADD_INCLUDE($PHP_GMP/include/$DEB_HOST_MULTIARCH)
   fi
 
   PHP_INSTALL_HEADERS([ext/gmp/php_gmp_int.h])

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 89c4b1953195ef792f717087bb5fed1d5b7aa77f..2c3b5246d6e01486a7d19ef88fb8aa6af3bece1f 100644 (file)
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -65,14 +65,11 @@ if test "$PHP_LDAP" != "no"; then
     AC_MSG_ERROR(Cannot find ldap.h)
   fi
 
-  dnl -pc removal is a hack for clang
-  MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//')
-
-  if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
+  if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.a || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/liblber.$SHLIB_SUFFIX_NAME; then
     PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 
-  elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
+  elif test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$DEB_HOST_MULTIARCH/libldap.$SHLIB_SUFFIX_NAME.3 || test -f $LDAP_LIBDIR/libldap.3.dylib; then
     PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.12.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.12.1; then

diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index 289eeb7c313e743e2c05183247fd4305ef64ff26..7b7a063310e1a207ec27d3cd0a953bdb6f10913a 100644 (file)
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -33,7 +33,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
       PHP_LIBDIR=lib
     fi
 
-    if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
+    if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/$DEB_HOST_MULTIARCH/libsybdb.so" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
        AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
     fi