Attachment #160951 for bug #195765

View | Details | Raw Unified | Return to bug 195765 | Differences between

and this patch




}

php5_2-sapi_set_php_ini_dir() {
	PHP_INI_DIR="${EPREFIX}/etc/php/${PHPSAPI}-php5"
	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
}

php5_2-sapi_install_ini() {
	destdir="${EPREFIX}"/usr/$(get_libdir)/php5

	# get the extension dir, if not already defined
	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"

	# work out where we are installing the ini file
	php5_2-sapi_set_php_ini_dir


	# Set the include path to point to where we want to find PEAR packages
	einfo "Setting correct include_path"
	sed -e "s|^;include_path = \".:/php/includes\".*|include_path = \".:${EPREFIX}/usr/share/php5:${EPREFIX}/usr/share/php\"|" -i ${phpinisrc}

	# Add needed MySQL extensions charset configuration
	local phpmycnfcharset=""

		echo ";pdo_mysql.connect_charset = utf8" >> ${phpinisrc}
	fi

	dodir ${PHP_INI_DIR#${EPREFIX}}
	insinto ${PHP_INI_DIR#${EPREFIX}}
	newins ${phpinisrc} ${PHP_INI_FILE}

	dodir ${PHP_EXT_INI_DIR#${EPREFIX}}
	dodir ${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}

	# Install any extensions built as shared objects
	if use sharedext ; then
		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort` ; do
			inifilename=${x/.so/.ini}
			inifilename=`basename ${inifilename}`
			echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
			dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}"
		done
	fi
}

	# Fix configure scripts to correctly support Suhosin
	einfo "Running aclocal"
	aclocal --force || die "Unable to run aclocal successfully"
	# Prefixed portage seems not to find libtoolize here, since it is glibtoolize
	einfo "Running libtoolize"
	libtoolize --copy --force ||
		glibtoolize --copy --force || 
		die "Unable to run libtoolize successfully"

	# Rebuild configure to make sure it's up to date
	einfo "Rebuilding configure script"

# Takes care of compiling php according to USE flags set by user (and those automagically
# enabled via phpconfutils eclass if unavoidable).
php5_2-sapi_src_compile() {
	destdir="${EPREFIX}"/usr/$(get_libdir)/php5

	php5_2-sapi_set_php_ini_dir



	#				extension		USE flag		shared support?
	phpconfutils_extension_enable	"bcmath"		"bcmath"		1
	phpconfutils_extension_with	"bz2"			"bzip2"			1 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"calendar"		"calendar"		1
	phpconfutils_extension_disable	"ctype"			"ctype"			0
	phpconfutils_extension_with	"curl"			"curl"			1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"curlwrappers"		"curlwrappers"		0
	phpconfutils_extension_enable	"dbase"			"dbase"			1
	phpconfutils_extension_disable	"dom"			"xml"			0

	phpconfutils_extension_disable	"filter"		"filter"		0
	phpconfutils_extension_enable	"ftp"			"ftp"			1
	phpconfutils_extension_with	"gettext"		"nls"			1
	phpconfutils_extension_with	"gmp"			"gmp"			1 "${EPREFIX}/usr"
	phpconfutils_extension_disable	"hash"			"hash"			0
	phpconfutils_extension_without	"iconv"			"iconv"			0
	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
	phpconfutils_extension_disable	"json"			"json"			0
	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "${EPREFIX}/usr"
	phpconfutils_extension_disable	"libxml"		"xml"			0
	phpconfutils_extension_enable	"mbstring"		"unicode"		1
	phpconfutils_extension_with	"mcrypt"		"crypt"			1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"mhash"			"mhash"			1
	phpconfutils_extension_with	"msql"			"msql"			1
	phpconfutils_extension_with	"mssql"			"mssql"			1
	phpconfutils_extension_with	"ncurses"		"ncurses"		1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"openssl"		"ssl"			0
	phpconfutils_extension_with	"openssl-dir"		"ssl"			0 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
	phpconfutils_extension_disable	"pdo"			"pdo"			0
	phpconfutils_extension_with	"pgsql"			"postgres"		1 "${EPREFIX}/usr"
	phpconfutils_extension_disable	"posix"			"posix"			0
	phpconfutils_extension_with	"pspell"		"spell"			1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"recode"		"recode"		1 "${EPREFIX}/usr"
	phpconfutils_extension_disable	"reflection"		"reflection"		0
	phpconfutils_extension_disable	"simplexml"		"simplexml"		0
	phpconfutils_extension_enable	"shmop"			"sharedmem"		0
	phpconfutils_extension_with	"snmp"			"snmp"			1 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"soap"			"soap"			1
	phpconfutils_extension_enable	"sockets"		"sockets"		1
	phpconfutils_extension_disable	"spl"			"spl"			0

	phpconfutils_extension_enable	"sysvmsg"		"sysvipc"		1
	phpconfutils_extension_enable	"sysvsem"		"sysvipc"		1
	phpconfutils_extension_enable	"sysvshm"		"sysvipc"		1
	phpconfutils_extension_with	"tidy"			"tidy"			1 "${EPREFIX}/usr"
	phpconfutils_extension_disable	"tokenizer"		"tokenizer"		0
	phpconfutils_extension_enable	"wddx"			"wddx"			1
	phpconfutils_extension_disable	"xml"			"xml"			0
	phpconfutils_extension_disable	"xmlreader"		"xmlreader"		0
	phpconfutils_extension_disable	"xmlwriter"		"xmlwriter"		0
	phpconfutils_extension_with	"xmlrpc"		"xmlrpc"		1
	phpconfutils_extension_with	"xsl"			"xsl"			1 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"zip"			"zip"			1
	phpconfutils_extension_with	"zlib"			"zlib"			1 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"debug"			"debug"			0

	# DBA support


	# DBA drivers support
	phpconfutils_extension_with 	"cdb"			"cdb"			0
	phpconfutils_extension_with 	"db4"			"berkdb"		0 "${EPREFIX}/usr"
	phpconfutils_extension_with 	"flatfile"		"flatfile"		0
	phpconfutils_extension_with 	"gdbm"			"gdbm"			0 "${EPREFIX}/usr"
	phpconfutils_extension_with 	"inifile"		"inifile"		0
	phpconfutils_extension_with	"qdbm"			"qdbm"			0 "${EPREFIX}/usr"

	# Support for the GD graphics library
	if use gd-external || phpconfutils_usecheck gd-external ; then
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "${EPREFIX}/usr"
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "${EPREFIX}/usr"
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk" 			0
		phpconfutils_extension_with 	"gd" 		"gd-external"		1 "${EPREFIX}/usr"
	else
		phpconfutils_extension_with	"freetype-dir"	"truetype"		0 "${EPREFIX}/usr"
		phpconfutils_extension_with	"t1lib"		"truetype"		0 "${EPREFIX}/usr"
		phpconfutils_extension_enable	"gd-jis-conv"	"cjk"			0
		phpconfutils_extension_with	"jpeg-dir"	"gd"			0 "${EPREFIX}/usr"
		phpconfutils_extension_with 	"png-dir" 	"gd" 			0 "${EPREFIX}/usr"
		phpconfutils_extension_with 	"xpm-dir" 	"xpm" 			0 "${EPREFIX}/usr"
		# enable gd last, so configure can pick up the previous settings
		phpconfutils_extension_with 	"gd" 		"gd" 			0 "${EPREFIX}/usr"
	fi

	# IMAP support


	# MySQL support
	if use mysql ; then
		phpconfutils_extension_with	"mysql"			"mysql"		1 "${EPREFIX}/usr"
		phpconfutils_extension_with	"mysql-sock"		"mysql"		0 "${EPREFIX}/var/run/mysqld/mysqld.sock"
	fi

	# MySQLi support
	phpconfutils_extension_with		"mysqli"		"mysqli"	1 "${EPREFIX}/usr/bin/mysql_config"

	# ODBC support
	if use odbc || phpconfutils_usecheck odbc ; then
		phpconfutils_extension_with	"unixODBC"		"odbc"		1 "${EPREFIX}/usr"

		phpconfutils_extension_with	"adabas"		"adabas"	1
		phpconfutils_extension_with	"birdstep"		"birdstep"	1

			OCI8IC_PKG="`printf ${OCI8IC_PKG} | sed -e 's|dev-db/oracle-instantclient-basic-||g' | sed -e 's|-r.*||g'`"
			phpconfutils_extension_with	"pdo-oci"	"oci8-instant-client"	1	"instantclient,/usr,${OCI8IC_PKG}"
		fi
		phpconfutils_extension_with		"pdo-odbc"	"odbc"		1 "unixODBC,${EPREFIX}/usr"
		phpconfutils_extension_with		"pdo-pgsql"	"postgres"	1 "${EPREFIX}/usr"
		phpconfutils_extension_with		"pdo-sqlite"	"sqlite"	1 "${EPREFIX}/usr"
	fi

	# readline/libedit support
	# You can use readline or libedit, but you can't use both
	phpconfutils_extension_with			"readline"	"readline"	0 "${EPREFIX}/usr"
	phpconfutils_extension_with			"libedit"	"libedit"	0 

	# Session support
	if ! use session && ! phpconfutils_usecheck session ; then

	tc-export CC

	# We don't use econf, because we need to override all of its settings
	./configure --prefix=${destdir} --host=${CHOST} --mandir=${destdir}/man --infodir=${destdir}/info --sysconfdir=${EPREFIX}/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} || die "configure failed"
	emake || die "make failed"
}


		for x in `ls "${S}/modules/"*.so | sort` ; do
			module=`basename ${x}`
			modulename=${module/.so/}
			insinto "${PHPEXTDIR#${EPREFIX}}"
			einfo "Installing PHP ${modulename} extension"
			doins "modules/${module}"
		done




	# cache this
	libdir=$(get_libdir)

	PHPIZE="${EPREFIX}/usr/${libdir}/php4/bin/phpize"
	PHPCONFIG="${EPREFIX}/usr/${libdir}/php4/bin/php-config"
	PHPCLI="${EPREFIX}/usr/${libdir}/php4/bin/php"
	PHPCGI="${EPREFIX}/usr/${libdir}/php4/bin/php-cgi"
	PHP_PKG="$(best_version =dev-lang/php-4*)"
	PHPPREFIX="${EPREFIX}/usr/${libdir}/php4"
	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"

	einfo

	# cache this
	libdir=$(get_libdir)

	PHPIZE="${EPREFIX}/usr/${libdir}/php5/bin/phpize"
	PHPCONFIG="${EPREFIX}/usr/${libdir}/php5/bin/php-config"
	PHPCLI="${EPREFIX}/usr/${libdir}/php5/bin/php"
	PHPCGI="${EPREFIX}/usr/${libdir}/php5/bin/php-cgi"
	PHP_PKG="$(best_version =dev-lang/php-5*)"
	PHPPREFIX="${EPREFIX}/usr/${libdir}/php5"
	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"

	einfo

	exit 1
fi

phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"
phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"

for x in $@ ; do
	if [[ -s "${x}" ]] ; then

Return to bug 195765

Lines 56-67 Link Here

(-)eclass/depend.php.eclass (-10 / +11 lines)
56	# cache this	56	# cache this
57	libdir=$(get_libdir)	57	libdir=$(get_libdir)
58		58
59	PHPIZE="/usr/${libdir}/php4/bin/phpize"	59	PHPIZE="${EPREFIX}/usr/${libdir}/php4/bin/phpize"
60	PHPCONFIG="/usr/${libdir}/php4/bin/php-config"	60	PHPCONFIG="${EPREFIX}/usr/${libdir}/php4/bin/php-config"
61	PHPCLI="/usr/${libdir}/php4/bin/php"	61	PHPCLI="${EPREFIX}/usr/${libdir}/php4/bin/php"
62	PHPCGI="/usr/${libdir}/php4/bin/php-cgi"	62	PHPCGI="${EPREFIX}/usr/${libdir}/php4/bin/php-cgi"
63	PHP_PKG="$(best_version =dev-lang/php-4*)"	63	PHP_PKG="$(best_version =dev-lang/php-4*)"
64	PHPPREFIX="/usr/${libdir}/php4"	64	PHPPREFIX="${EPREFIX}/usr/${libdir}/php4"
65	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"	65	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
66		66
67	einfo	67	einfo
Lines 107-118 Link Here
107	# cache this	107	# cache this
108	libdir=$(get_libdir)	108	libdir=$(get_libdir)
109		109
110	PHPIZE="/usr/${libdir}/php5/bin/phpize"	110	PHPIZE="${EPREFIX}/usr/${libdir}/php5/bin/phpize"
111	PHPCONFIG="/usr/${libdir}/php5/bin/php-config"	111	PHPCONFIG="${EPREFIX}/usr/${libdir}/php5/bin/php-config"
112	PHPCLI="/usr/${libdir}/php5/bin/php"	112	PHPCLI="${EPREFIX}/usr/${libdir}/php5/bin/php"
113	PHPCGI="/usr/${libdir}/php5/bin/php-cgi"	113	PHPCGI="${EPREFIX}/usr/${libdir}/php5/bin/php-cgi"
114	PHP_PKG="$(best_version =dev-lang/php-5*)"	114	PHP_PKG="$(best_version =dev-lang/php-5*)"
115	PHPPREFIX="/usr/${libdir}/php5"	115	PHPPREFIX="${EPREFIX}/usr/${libdir}/php5"
116	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"	116	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
117		117
118	einfo	118	einfo
Lines 624-630 Link Here
624	exit 1	624	exit 1
625	fi	625	fi
626		626
		627	phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"
627	phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"	628	phpdocdir="${ED}/usr/share/doc/${CATEGORY}/${PF}/"
628		629
629	for x in $@ ; do	630	for x in $@ ; do
630	if [[ -s "${x}" ]] ; then	631	if [[ -s "${x}" ]] ; then

Lines 228-243 Link Here

(-)eclass/php5_2-sapi.eclass (-50 / +53 lines)
228	}	228	}
229		229
230	php5_2-sapi_set_php_ini_dir() {	230	php5_2-sapi_set_php_ini_dir() {
231	PHP_INI_DIR="/etc/php/${PHPSAPI}-php5"	231	PHP_INI_DIR="${EPREFIX}/etc/php/${PHPSAPI}-php5"
232	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"	232	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
233	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"	233	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
234	}	234	}
235		235
236	php5_2-sapi_install_ini() {	236	php5_2-sapi_install_ini() {
237	destdir=/usr/$(get_libdir)/php5	237	destdir="${EPREFIX}"/usr/$(get_libdir)/php5
238		238
239	# get the extension dir, if not already defined	239	# get the extension dir, if not already defined
240	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${ED}/${destdir}/bin/php-config" --extension-dir`"	240	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
241		241
242	# work out where we are installing the ini file	242	# work out where we are installing the ini file
243	php5_2-sapi_set_php_ini_dir	243	php5_2-sapi_set_php_ini_dir
Lines 255-261 Link Here
255		255
256	# Set the include path to point to where we want to find PEAR packages	256	# Set the include path to point to where we want to find PEAR packages
257	einfo "Setting correct include_path"	257	einfo "Setting correct include_path"
258	sed -e 's\|^;include_path = ".:/php/includes".*\|include_path = ".:/usr/share/php5:/usr/share/php"\|' -i ${phpinisrc}	258	sed -e "s\|^;include_path = \".:/php/includes\".*\|include_path = \".:${EPREFIX}/usr/share/php5:${EPREFIX}/usr/share/php\"\|" -i ${phpinisrc}
259		259
260	# Add needed MySQL extensions charset configuration	260	# Add needed MySQL extensions charset configuration
261	local phpmycnfcharset=""	261	local phpmycnfcharset=""
Lines 288-307 Link Here
288	echo ";pdo_mysql.connect_charset = utf8" >> ${phpinisrc}	288	echo ";pdo_mysql.connect_charset = utf8" >> ${phpinisrc}
289	fi	289	fi
290		290
291	dodir ${PHP_INI_DIR}	291	dodir ${PHP_INI_DIR#${EPREFIX}}
292	insinto ${PHP_INI_DIR}	292	insinto ${PHP_INI_DIR#${EPREFIX}}
293	newins ${phpinisrc} ${PHP_INI_FILE}	293	newins ${phpinisrc} ${PHP_INI_FILE}
294		294
295	dodir ${PHP_EXT_INI_DIR}	295	dodir ${PHP_EXT_INI_DIR#${EPREFIX}}
296	dodir ${PHP_EXT_INI_DIR_ACTIVE}	296	dodir ${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}
297		297
298	# Install any extensions built as shared objects	298	# Install any extensions built as shared objects
299	if use sharedext ; then	299	if use sharedext ; then
300	for x in `ls "${ED}/${PHPEXTDIR}/"*.so \| sort` ; do	300	for x in `ls "${D}/${PHPEXTDIR}/"*.so \| sort` ; do
301	inifilename=${x/.so/.ini}	301	inifilename=${x/.so/.ini}
302	inifilename=`basename ${inifilename}`	302	inifilename=`basename ${inifilename}`
303	echo "extension=`basename ${x}`" >> "${ED}/${PHP_EXT_INI_DIR}/${inifilename}"	303	echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
304	dosym "${PHP_EXT_INI_DIR}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE}/${inifilename}"	304	dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}"
305	done	305	done
306	fi	306	fi
307	}	307	}
Lines 390-397 Link Here
390	# Fix configure scripts to correctly support Suhosin	390	# Fix configure scripts to correctly support Suhosin
391	einfo "Running aclocal"	391	einfo "Running aclocal"
392	aclocal --force \|\| die "Unable to run aclocal successfully"	392	aclocal --force \|\| die "Unable to run aclocal successfully"
		393	# Prefixed portage seems not to find libtoolize here, since it is glibtoolize
393	einfo "Running libtoolize"	394	einfo "Running libtoolize"
394	libtoolize --copy --force \|\| die "Unable to run libtoolize successfully"	395	libtoolize --copy --force \|\|
		396	glibtoolize --copy --force \|\|
		397	die "Unable to run libtoolize successfully"
395		398
396	# Rebuild configure to make sure it's up to date	399	# Rebuild configure to make sure it's up to date
397	einfo "Rebuilding configure script"	400	einfo "Rebuilding configure script"
Lines 409-415 Link Here
409	# Takes care of compiling php according to USE flags set by user (and those automagically	412	# Takes care of compiling php according to USE flags set by user (and those automagically
410	# enabled via phpconfutils eclass if unavoidable).	413	# enabled via phpconfutils eclass if unavoidable).
411	php5_2-sapi_src_compile() {	414	php5_2-sapi_src_compile() {
412	destdir=/usr/$(get_libdir)/php5	415	destdir="${EPREFIX}"/usr/$(get_libdir)/php5
413		416
414	php5_2-sapi_set_php_ini_dir	417	php5_2-sapi_set_php_ini_dir
415		418
Lines 421-430 Link Here
421		424
422	# extension USE flag shared support?	425	# extension USE flag shared support?
423	phpconfutils_extension_enable "bcmath" "bcmath" 1	426	phpconfutils_extension_enable "bcmath" "bcmath" 1
424	phpconfutils_extension_with "bz2" "bzip2" 1	427	phpconfutils_extension_with "bz2" "bzip2" 1 "${EPREFIX}/usr"
425	phpconfutils_extension_enable "calendar" "calendar" 1	428	phpconfutils_extension_enable "calendar" "calendar" 1
426	phpconfutils_extension_disable "ctype" "ctype" 0	429	phpconfutils_extension_disable "ctype" "ctype" 0
427	phpconfutils_extension_with "curl" "curl" 1	430	phpconfutils_extension_with "curl" "curl" 1 "${EPREFIX}/usr"
428	phpconfutils_extension_with "curlwrappers" "curlwrappers" 0	431	phpconfutils_extension_with "curlwrappers" "curlwrappers" 0
429	phpconfutils_extension_enable "dbase" "dbase" 1	432	phpconfutils_extension_enable "dbase" "dbase" 1
430	phpconfutils_extension_disable "dom" "xml" 0	433	phpconfutils_extension_disable "dom" "xml" 0
Lines 434-465 Link Here
434	phpconfutils_extension_disable "filter" "filter" 0	437	phpconfutils_extension_disable "filter" "filter" 0
435	phpconfutils_extension_enable "ftp" "ftp" 1	438	phpconfutils_extension_enable "ftp" "ftp" 1
436	phpconfutils_extension_with "gettext" "nls" 1	439	phpconfutils_extension_with "gettext" "nls" 1
437	phpconfutils_extension_with "gmp" "gmp" 1	440	phpconfutils_extension_with "gmp" "gmp" 1 "${EPREFIX}/usr"
438	phpconfutils_extension_disable "hash" "hash" 0	441	phpconfutils_extension_disable "hash" "hash" 0
439	phpconfutils_extension_without "iconv" "iconv" 0	442	phpconfutils_extension_without "iconv" "iconv" 0
440	phpconfutils_extension_disable "ipv6" "ipv6" 0	443	phpconfutils_extension_disable "ipv6" "ipv6" 0
441	phpconfutils_extension_disable "json" "json" 0	444	phpconfutils_extension_disable "json" "json" 0
442	phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr"	445	phpconfutils_extension_with "kerberos" "kerberos" 0 "${EPREFIX}/usr"
443	phpconfutils_extension_disable "libxml" "xml" 0	446	phpconfutils_extension_disable "libxml" "xml" 0
444	phpconfutils_extension_enable "mbstring" "unicode" 1	447	phpconfutils_extension_enable "mbstring" "unicode" 1
445	phpconfutils_extension_with "mcrypt" "crypt" 1	448	phpconfutils_extension_with "mcrypt" "crypt" 1 "${EPREFIX}/usr"
446	phpconfutils_extension_with "mhash" "mhash" 1	449	phpconfutils_extension_with "mhash" "mhash" 1
447	phpconfutils_extension_with "msql" "msql" 1	450	phpconfutils_extension_with "msql" "msql" 1
448	phpconfutils_extension_with "mssql" "mssql" 1	451	phpconfutils_extension_with "mssql" "mssql" 1
449	phpconfutils_extension_with "ncurses" "ncurses" 1	452	phpconfutils_extension_with "ncurses" "ncurses" 1 "${EPREFIX}/usr"
450	phpconfutils_extension_with "openssl" "ssl" 0	453	phpconfutils_extension_with "openssl" "ssl" 0
451	phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr"	454	phpconfutils_extension_with "openssl-dir" "ssl" 0 "${EPREFIX}/usr"
452	phpconfutils_extension_enable "pcntl" "pcntl" 1	455	phpconfutils_extension_enable "pcntl" "pcntl" 1
453	phpconfutils_extension_without "pcre-regex" "pcre" 0	456	phpconfutils_extension_without "pcre-regex" "pcre" 0
454	phpconfutils_extension_disable "pdo" "pdo" 0	457	phpconfutils_extension_disable "pdo" "pdo" 0
455	phpconfutils_extension_with "pgsql" "postgres" 1	458	phpconfutils_extension_with "pgsql" "postgres" 1 "${EPREFIX}/usr"
456	phpconfutils_extension_disable "posix" "posix" 0	459	phpconfutils_extension_disable "posix" "posix" 0
457	phpconfutils_extension_with "pspell" "spell" 1	460	phpconfutils_extension_with "pspell" "spell" 1 "${EPREFIX}/usr"
458	phpconfutils_extension_with "recode" "recode" 1	461	phpconfutils_extension_with "recode" "recode" 1 "${EPREFIX}/usr"
459	phpconfutils_extension_disable "reflection" "reflection" 0	462	phpconfutils_extension_disable "reflection" "reflection" 0
460	phpconfutils_extension_disable "simplexml" "simplexml" 0	463	phpconfutils_extension_disable "simplexml" "simplexml" 0
461	phpconfutils_extension_enable "shmop" "sharedmem" 0	464	phpconfutils_extension_enable "shmop" "sharedmem" 0
462	phpconfutils_extension_with "snmp" "snmp" 1	465	phpconfutils_extension_with "snmp" "snmp" 1 "${EPREFIX}/usr"
463	phpconfutils_extension_enable "soap" "soap" 1	466	phpconfutils_extension_enable "soap" "soap" 1
464	phpconfutils_extension_enable "sockets" "sockets" 1	467	phpconfutils_extension_enable "sockets" "sockets" 1
465	phpconfutils_extension_disable "spl" "spl" 0	468	phpconfutils_extension_disable "spl" "spl" 0
Lines 468-483 Link Here
468	phpconfutils_extension_enable "sysvmsg" "sysvipc" 1	471	phpconfutils_extension_enable "sysvmsg" "sysvipc" 1
469	phpconfutils_extension_enable "sysvsem" "sysvipc" 1	472	phpconfutils_extension_enable "sysvsem" "sysvipc" 1
470	phpconfutils_extension_enable "sysvshm" "sysvipc" 1	473	phpconfutils_extension_enable "sysvshm" "sysvipc" 1
471	phpconfutils_extension_with "tidy" "tidy" 1	474	phpconfutils_extension_with "tidy" "tidy" 1 "${EPREFIX}/usr"
472	phpconfutils_extension_disable "tokenizer" "tokenizer" 0	475	phpconfutils_extension_disable "tokenizer" "tokenizer" 0
473	phpconfutils_extension_enable "wddx" "wddx" 1	476	phpconfutils_extension_enable "wddx" "wddx" 1
474	phpconfutils_extension_disable "xml" "xml" 0	477	phpconfutils_extension_disable "xml" "xml" 0
475	phpconfutils_extension_disable "xmlreader" "xmlreader" 0	478	phpconfutils_extension_disable "xmlreader" "xmlreader" 0
476	phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0	479	phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0
477	phpconfutils_extension_with "xmlrpc" "xmlrpc" 1	480	phpconfutils_extension_with "xmlrpc" "xmlrpc" 1
478	phpconfutils_extension_with "xsl" "xsl" 1	481	phpconfutils_extension_with "xsl" "xsl" 1 "${EPREFIX}/usr"
479	phpconfutils_extension_enable "zip" "zip" 1	482	phpconfutils_extension_enable "zip" "zip" 1
480	phpconfutils_extension_with "zlib" "zlib" 1	483	phpconfutils_extension_with "zlib" "zlib" 1 "${EPREFIX}/usr"
481	phpconfutils_extension_enable "debug" "debug" 0	484	phpconfutils_extension_enable "debug" "debug" 0
482		485
483	# DBA support	486	# DBA support
Lines 492-518 Link Here
492		495
493	# DBA drivers support	496	# DBA drivers support
494	phpconfutils_extension_with "cdb" "cdb" 0	497	phpconfutils_extension_with "cdb" "cdb" 0
495	phpconfutils_extension_with "db4" "berkdb" 0	498	phpconfutils_extension_with "db4" "berkdb" 0 "${EPREFIX}/usr"
496	phpconfutils_extension_with "flatfile" "flatfile" 0	499	phpconfutils_extension_with "flatfile" "flatfile" 0
497	phpconfutils_extension_with "gdbm" "gdbm" 0	500	phpconfutils_extension_with "gdbm" "gdbm" 0 "${EPREFIX}/usr"
498	phpconfutils_extension_with "inifile" "inifile" 0	501	phpconfutils_extension_with "inifile" "inifile" 0
499	phpconfutils_extension_with "qdbm" "qdbm" 0	502	phpconfutils_extension_with "qdbm" "qdbm" 0 "${EPREFIX}/usr"
500		503
501	# Support for the GD graphics library	504	# Support for the GD graphics library
502	if use gd-external \|\| phpconfutils_usecheck gd-external ; then	505	if use gd-external \|\| phpconfutils_usecheck gd-external ; then
503	phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr"	506	phpconfutils_extension_with "freetype-dir" "truetype" 0 "${EPREFIX}/usr"
504	phpconfutils_extension_with "t1lib" "truetype" 0 "/usr"	507	phpconfutils_extension_with "t1lib" "truetype" 0 "${EPREFIX}/usr"
505	phpconfutils_extension_enable "gd-jis-conv" "cjk" 0	508	phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
506	phpconfutils_extension_with "gd" "gd-external" 1 "/usr"	509	phpconfutils_extension_with "gd" "gd-external" 1 "${EPREFIX}/usr"
507	else	510	else
508	phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr"	511	phpconfutils_extension_with "freetype-dir" "truetype" 0 "${EPREFIX}/usr"
509	phpconfutils_extension_with "t1lib" "truetype" 0 "/usr"	512	phpconfutils_extension_with "t1lib" "truetype" 0 "${EPREFIX}/usr"
510	phpconfutils_extension_enable "gd-jis-conv" "cjk" 0	513	phpconfutils_extension_enable "gd-jis-conv" "cjk" 0
511	phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr"	514	phpconfutils_extension_with "jpeg-dir" "gd" 0 "${EPREFIX}/usr"
512	phpconfutils_extension_with "png-dir" "gd" 0 "/usr"	515	phpconfutils_extension_with "png-dir" "gd" 0 "${EPREFIX}/usr"
513	phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr"	516	phpconfutils_extension_with "xpm-dir" "xpm" 0 "${EPREFIX}/usr"
514	# enable gd last, so configure can pick up the previous settings	517	# enable gd last, so configure can pick up the previous settings
515	phpconfutils_extension_with "gd" "gd" 0	518	phpconfutils_extension_with "gd" "gd" 0 "${EPREFIX}/usr"
516	fi	519	fi
517		520
518	# IMAP support	521	# IMAP support
Lines 543-558 Link Here
543		546
544	# MySQL support	547	# MySQL support
545	if use mysql ; then	548	if use mysql ; then
546	phpconfutils_extension_with "mysql" "mysql" 1 "/usr"	549	phpconfutils_extension_with "mysql" "mysql" 1 "${EPREFIX}/usr"
547	phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock"	550	phpconfutils_extension_with "mysql-sock" "mysql" 0 "${EPREFIX}/var/run/mysqld/mysqld.sock"
548	fi	551	fi
549		552
550	# MySQLi support	553	# MySQLi support
551	phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config"	554	phpconfutils_extension_with "mysqli" "mysqli" 1 "${EPREFIX}/usr/bin/mysql_config"
552		555
553	# ODBC support	556	# ODBC support
554	if use odbc \|\| phpconfutils_usecheck odbc ; then	557	if use odbc \|\| phpconfutils_usecheck odbc ; then
555	phpconfutils_extension_with "unixODBC" "odbc" 1 "/usr"	558	phpconfutils_extension_with "unixODBC" "odbc" 1 "${EPREFIX}/usr"
556		559
557	phpconfutils_extension_with "adabas" "adabas" 1	560	phpconfutils_extension_with "adabas" "adabas" 1
558	phpconfutils_extension_with "birdstep" "birdstep" 1	561	phpconfutils_extension_with "birdstep" "birdstep" 1
Lines 592-606 Link Here
592	OCI8IC_PKG="`printf ${OCI8IC_PKG} \| sed -e 's\|dev-db/oracle-instantclient-basic-\|\|g' \| sed -e 's\|-r.*\|\|g'`"	595	OCI8IC_PKG="`printf ${OCI8IC_PKG} \| sed -e 's\|dev-db/oracle-instantclient-basic-\|\|g' \| sed -e 's\|-r.*\|\|g'`"
593	phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 "instantclient,/usr,${OCI8IC_PKG}"	596	phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 "instantclient,/usr,${OCI8IC_PKG}"
594	fi	597	fi
595	phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr"	598	phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,${EPREFIX}/usr"
596	phpconfutils_extension_with "pdo-pgsql" "postgres" 1	599	phpconfutils_extension_with "pdo-pgsql" "postgres" 1 "${EPREFIX}/usr"
597	phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "/usr"	600	phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "${EPREFIX}/usr"
598	fi	601	fi
599		602
600	# readline/libedit support	603	# readline/libedit support
601	# You can use readline or libedit, but you can't use both	604	# You can use readline or libedit, but you can't use both
602	phpconfutils_extension_with "readline" "readline" 0	605	phpconfutils_extension_with "readline" "readline" 0 "${EPREFIX}/usr"
603	phpconfutils_extension_with "libedit" "libedit" 0	606	phpconfutils_extension_with "libedit" "libedit" 0
604		607
605	# Session support	608	# Session support
606	if ! use session && ! phpconfutils_usecheck session ; then	609	if ! use session && ! phpconfutils_usecheck session ; then
Lines 638-644 Link Here
638	tc-export CC	641	tc-export CC
639		642
640	# We don't use econf, because we need to override all of its settings	643	# We don't use econf, because we need to override all of its settings
641	./configure --prefix=${destdir} --host=${CHOST} --mandir=${destdir}/man --infodir=${destdir}/info --sysconfdir=/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} \|\| die "configure failed"	644	./configure --prefix=${destdir} --host=${CHOST} --mandir=${destdir}/man --infodir=${destdir}/info --sysconfdir=${EPREFIX}/etc --cache-file=./config.cache ${my_conf} ${EXTRA_ECONF} \|\| die "configure failed"
642	emake \|\| die "make failed"	645	emake \|\| die "make failed"
643	}	646	}
644		647
Lines 685-691 Link Here
685	for x in `ls "${S}/modules/"*.so \| sort` ; do	688	for x in `ls "${S}/modules/"*.so \| sort` ; do
686	module=`basename ${x}`	689	module=`basename ${x}`
687	modulename=${module/.so/}	690	modulename=${module/.so/}
688	insinto "${PHPEXTDIR}"	691	insinto "${PHPEXTDIR#${EPREFIX}}"
689	einfo "Installing PHP ${modulename} extension"	692	einfo "Installing PHP ${modulename} extension"
690	doins "modules/${module}"	693	doins "modules/${module}"
691	done	694	done