Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
18172936 php requires changes due to EOF for MySQL 5.1 in S12
authorCraig Mohrman <craig.mohrman@oracle.com>
Fri, 28 Feb 2014 10:20:07 -0800
changeset 1732 8156945eb4a9
parent 1731 17c04245b278
child 1733 01e7b01b604b
18172936 php requires changes due to EOF for MySQL 5.1 in S12
components/php-5_2/common.mk file | annotate | diff | comparison | revisions
components/php-5_2/php-nsapi/Makefile file | annotate | diff | comparison | revisions
components/php-5_2/php-sapi/Makefile file | annotate | diff | comparison | revisions
components/php-5_2/php-sapi/patches/01_php_build_config.m4.patch file | annotate | diff | comparison | revisions
components/php-5_2/resolve.deps file | annotate | diff | comparison | revisions 
--- a/components/php-5_2/common.mk	Thu Feb 27 13:10:40 2014 -0800
+++ b/components/php-5_2/common.mk	Fri Feb 28 10:20:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 PHP_REL=		5.2
@@ -54,8 +54,8 @@
 IMAP_CLIENT_DIR = $(IMAP_DIR)/c-client
 MODULES_DIR = $(TOP_DIR)/modules
 MODULES_CONF_DIR=$(CONF_DIR)/conf.d
-MYSQL_DIR = /usr/mysql/5.1
-MYSQL_LIBDIR=/usr/mysql/5.1/lib/mysql
+MYSQL_DIR = /usr/mysql/5.5
+MYSQL_LIBDIR=/usr/mysql/5.5/lib
 PHP_SAPI_BUILD = $(COMPONENT_DIR)/../php-sapi/build/$(MACH32)
 PEAR_DIR=/var/php/$(PHP_REL)/pear
 
--- a/components/php-5_2/php-nsapi/Makefile	Thu Feb 27 13:10:40 2014 -0800
+++ b/components/php-5_2/php-nsapi/Makefile	Fri Feb 28 10:20:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -80,11 +80,11 @@
 	--with-ldap=shared \
 	--with-mysql=shared,$(MYSQL_DIR) \
 	--with-mysql-sock=/tmp/mysql.sock \
-	--with-mysqli=shared,$(MYSQL_DIR)/bin/mysql_config \
+	--with-mysqli=shared,$(MYSQL_DIR)/bin/$(MACH32)/mysql_config \
 	--with-nsapi=$(COMPONENT_DIR)/webserver7-spi \
 	--with-openssl=shared \
 	--with-pear=$(PEAR_DIR) \
-	--with-pdo-mysql=shared,$(MYSQL_DIR) \
+	--with-pdo-mysql=shared,$(MYSQL_DIR)/bin/$(MACH32)/mysql_config \
 	--with-pdo-sqlite=shared \
 	--with-snmp=shared,/usr \
 	--with-sqlite=shared \
@@ -95,9 +95,9 @@
 COMPONENT_POST_BUILD_ACTION = ( \
 	cat $(BUILD_DIR_32)/scripts/phpize | \
 	 sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
-	 sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
-	 sed -e "s%^includedir=.*%includedir=$(SOURCE_DIR)%" | \
-	 sed -e "s%^phpdir=.*%phpdir=$(SOURCE_DIR)%"  | \
+	 sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
+	 sed -e "s%^includedir=.*%includedir=$(BUILD_DIR_32)%" | \
+	 sed -e "s%^phpdir=.*%phpdir=$(BUILD_DIR_32)%"  | \
 	 sed -e "s%phpdir/phpize.m4%phpdir/scripts/phpize.m4%" | \
 	 sed -e 's%cd "$$phpdir" && cp $$FILES_BUILD "$$builddir"/build%cd "$$phpdir/build" \&\& cp $$FILES_BUILD "$$builddir"/build%' \
 	 > phpize-proto.zts ; \
--- a/components/php-5_2/php-sapi/Makefile	Thu Feb 27 13:10:40 2014 -0800
+++ b/components/php-5_2/php-sapi/Makefile	Fri Feb 28 10:20:07 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -72,10 +72,10 @@
 	--with-ldap=shared \
 	--with-mysql=shared,$(MYSQL_DIR) \
 	--with-mysql-sock=/tmp/mysql.sock \
-	--with-mysqli=shared,$(MYSQL_DIR)/bin/mysql_config \
+	--with-mysqli=shared,$(MYSQL_DIR)/bin/$(MACH32)/mysql_config \
 	--with-openssl=shared \
 	--with-pear=$(PEAR_DIR) \
-	--with-pdo-mysql=shared,$(MYSQL_DIR) \
+	--with-pdo-mysql=shared,$(MYSQL_DIR)/bin/$(MACH32)/mysql_config \
 	--with-pdo-sqlite=shared \
 	--with-snmp=shared,/usr \
 	--with-sqlite=shared \
@@ -87,9 +87,9 @@
 COMPONENT_POST_BUILD_ACTION = ( \
 	cat $(BUILD_DIR_32)/scripts/phpize | \
 	 sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
-	 sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
-	 sed -e "s%^includedir=.*%includedir=$(SOURCE_DIR)%" | \
-	 sed -e "s%^phpdir=.*%phpdir=$(SOURCE_DIR)%"  | \
+	 sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
+	 sed -e "s%^includedir=.*%includedir=$(BUILD_DIR_32)%" | \
+	 sed -e "s%^phpdir=.*%phpdir=$(BUILD_DIR_32)%"  | \
 	 sed -e "s%phpdir/phpize.m4%phpdir/scripts/phpize.m4%" | \
 	 sed -e "s%$PHP_AUTOCONF   || exit 1%$PHP_AUTOCONF -f   || exit 1%" | \
 	 sed -e "s%$PHP_AUTOHEADER || exit 1%$PHP_AUTOHEADER -f || exit 1%" | \
@@ -99,8 +99,8 @@
 	chmod 755 phpize-proto ) ; \
 	( cat $(BUILD_DIR_32)/scripts/php-config | \
 	 sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
-	 sed -e "s%^prefix=.*%prefix=$(SOURCE_DIR)%" | \
-	 sed -e "s%^include_dir=.*%include_dir=$(SOURCE_DIR)%" \
+	 sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
+	 sed -e "s%^include_dir=.*%include_dir=$(BUILD_DIR_32)%" \
 	 > php-config-proto ; \
 	chmod 755 php-config-proto ) ; \
 	( cat $(BUILD_DIR_32)/scripts/php-config | \
--- a/components/php-5_2/php-sapi/patches/01_php_build_config.m4.patch	Thu Feb 27 13:10:40 2014 -0800
+++ b/components/php-5_2/php-sapi/patches/01_php_build_config.m4.patch	Fri Feb 28 10:20:07 2014 -0800
@@ -15,7 +15,7 @@
    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"
++  MYSQL_SHARED_LIBADD="$MYSQL_SHARED_LIBADD -R/usr/mysql/5.5/lib"
    PHP_SUBST(MYSQL_SHARED_LIBADD)
    PHP_SUBST_OLD(MYSQL_MODULE_TYPE)
    PHP_SUBST_OLD(MYSQL_LIBS)
@@ -36,7 +36,7 @@
    ])
    PDO_MYSQL_MODULE_TYPE=external
  
-+  PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
++  PDO_MYSQL_SHARED_LIBADD="$PDO_MYSQL_SHARED_LIBADD -R/usr/mysql/5.5/lib"
    PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)
    PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE)
  fi
@@ -61,7 +61,7 @@
    ])
  
    PHP_NEW_EXTENSION(mysqli, mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c mysqli_fe.c mysqli_report.c mysqli_repl.c mysqli_driver.c mysqli_warning.c mysqli_exception.c mysqli_embedded.c, $ext_shared)
-+  MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -R/usr/mysql/5.1/lib/mysql"
++  MYSQLI_SHARED_LIBADD="$MYSQLI_SHARED_LIBADD -R/usr/mysql/5.5/lib"
    PHP_SUBST(MYSQLI_SHARED_LIBADD)
  fi
 --- php-5.2.9/sapi/apache/config.m4.ORIG	Wed Mar 11 17:32:35 2009
--- a/components/php-5_2/resolve.deps	Thu Feb 27 13:10:40 2014 -0800
+++ b/components/php-5_2/resolve.deps	Fri Feb 28 10:20:07 2014 -0800
@@ -1,5 +1,5 @@
 compress/bzip2
-database/mysql-51/library
+database/mysql-55/library
 image/library/libjpeg
 image/library/libpng
 library/libidn
upstream/oracle/userland-gate