18562602 php 5.3 mysql bits have a bad runpath
authorCraig Mohrman <craig.mohrman@oracle.com>
Wed, 16 Apr 2014 18:14:47 -0700
changeset 1831 2175d25787f8
parent 1830 93243cb310c5
child 1832 30ac428a2aaf
18562602 php 5.3 mysql bits have a bad runpath
components/php-5_3/php-sapi/patches/011_php_ext_mysql_config.m4.patch
components/php-5_3/php-sapi/patches/012_php_ext_pdo_mysql_config.m4.patch
components/php-5_3/php-sapi/patches/013_php_ext_mysqli_config.m4.patch
--- a/components/php-5_3/php-sapi/patches/011_php_ext_mysql_config.m4.patch	Thu Apr 10 15:30:14 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- php-5.3.10/ext/mysql/config.m4_orig	Mon Nov 30 07:11:29 2009
-+++ php-5.3.10/ext/mysql/config.m4	Wed Feb  8 11:25:25 2012
[email protected]@ -78,7 +78,9 @@
- Note that the MySQL client library is not bundled anymore!])
-   fi
- 
--  if test "$enable_maintainer_zts" = "yes"; then
-+  use_reentrant_mysqlclient="yes"
-+  if test "$enable_maintainer_zts" = "yes" -o \
-+    "$use_reentrant_mysqlclient" = "yes" ; then
-     MYSQL_LIBNAME=mysqlclient_r
-   else
-     MYSQL_LIBNAME=mysqlclient
[email protected]@ -132,7 +134,9 @@
-   MYSQL_MODULE_TYPE=external
-   MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
-   MYSQL_INCLUDE=-I$MYSQL_INC_DIR
-+  MYSQL_SHARED_LIBADD="$MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
-  
-+  PHP_SUBST(MYSQL_SHARED_LIBADD)
-   PHP_SUBST_OLD(MYSQL_MODULE_TYPE)
-   PHP_SUBST_OLD(MYSQL_LIBS)
-   PHP_SUBST_OLD(MYSQL_INCLUDE)
--- a/components/php-5_3/php-sapi/patches/012_php_ext_pdo_mysql_config.m4.patch	Thu Apr 10 15:30:14 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- php-5.3.10/ext/pdo_mysql/config.m4_orig	Sat May 14 22:49:34 2011
-+++ php-5.3.10/ext/pdo_mysql/config.m4	Wed Feb  8 11:25:25 2012
[email protected]@ -64,7 +64,9 @@
-       if test "x$SED" = "x"; then
-         AC_PATH_PROG(SED, sed)
-       fi
--      if test "$enable_maintainer_zts" = "yes"; then
-+      use_reentrant_mysqlclient="yes"
-+      if test "$enable_maintainer_zts" = "yes" -o \
-+        "$use_reentrant_mysqlclient" = "yes" ; then
-         PDO_MYSQL_LIBNAME=mysqlclient_r
-         PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs_r | $SED -e "s/'//g"`
-       else
[email protected]@ -167,6 +169,7 @@
-     fi
-   ])
-   PDO_MYSQL_MODULE_TYPE=external
-+  PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
- 
-   PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
-   PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
--- a/components/php-5_3/php-sapi/patches/013_php_ext_mysqli_config.m4.patch	Thu Apr 10 15:30:14 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- php-5.3.10/ext/mysqli/config.m4_orig	Fri Aug 20 05:25:17 2010
-+++ php-5.3.10/ext/mysqli/config.m4	Wed Feb  8 11:25:25 2012
[email protected]@ -23,6 +23,7 @@
-     MYSQL_CONFIG=$PHP_MYSQLI
-   fi
- 
-+  use_reentrant_mysqlclient="yes"
-   MYSQL_LIB_NAME='mysqlclient'
-   if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
-     AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
[email protected]@ -29,7 +30,8 @@
-     MYSQL_LIB_CFG='--libmysqld-libs'
-     dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
-     mysqli_extra_sources="mysqli_embedded.c"
--  elif test "$enable_maintainer_zts" = "yes"; then
-+  elif test "$enable_maintainer_zts" = "yes" -o \
-+    "$use_reentrant_mysqlclient" = "yes" ; then
-     MYSQL_LIB_CFG='--libs_r'
-     MYSQL_LIB_NAME='mysqlclient_r'
-   else
[email protected]@ -79,6 +81,7 @@
-                   mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
-                   mysqli_exception.c $mysqli_extra_sources"
-   PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
-+  MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
-   PHP_SUBST(MYSQLI_SHARED_LIBADD)
-   PHP_INSTALL_HEADERS([ext/mysqli/php_mysqli_structs.h])
-