Attachment #160956 for bug #195765

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

and this patch




	destdir="${EPREFIX}"/usr/$(get_libdir)/php4

	# 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
	php4_4-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/php4:${EPREFIX}/usr/share/php\"|" -i ${phpinisrc}

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

		for x in `ls "${D}/${PHPEXTDIR}/"*.so | sort | sed -e "s|.*java.*||g"` ; 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

	# Apply general PHP4 patches
	if [[ -d "${WORKDIR}/${MY_PHP_PV}/php4" ]] ; then
		EPATCH_SOURCE="${WORKDIR}/${MY_PHP_PV}/php4" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
		# If we patch PHP for libtool compilation, we should patch it for libtool linking, too!
		epatch "${FILESDIR}/php4-libtool-1.5-linking.patch"
	fi

	# Apply version-specific PHP patches

	phpconfutils_extension_with	"iconv"			"iconv"			0
	phpconfutils_extension_with	"informix"		"informix"		1
	phpconfutils_extension_disable	"ipv6"			"ipv6"			0
	phpconfutils_extension_with	"kerberos"		"kerberos"		0 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"mbstring"		"unicode"		1
	phpconfutils_extension_with	"mcal"			"mcal"			1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"mcrypt"		"crypt"			1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"mcve"			"mcve"			1
	phpconfutils_extension_enable	"memory-limit"		"memlimit"		0
	phpconfutils_extension_with	"mhash"			"mhash"			1

	phpconfutils_extension_with	"mnogosearch"		"mnogosearch"		1
	phpconfutils_extension_with	"msql"			"msql"			1
	phpconfutils_extension_with	"mssql"			"mssql"			1
	phpconfutils_extension_with	"ncurses"		"ncurses"		1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"oci8"			"oci8"			1 "${EPREFIX}/usr"
	phpconfutils_extension_with	"oci8-instant-client"	"oci8-instant-client"	1
	phpconfutils_extension_with	"oracle"		"oracle7"		1

	phpconfutils_extension_enable	"pcntl" 		"pcntl" 		1
	phpconfutils_extension_without	"pcre-regex"		"pcre"			0
	phpconfutils_extension_with	"pfpro"			"pfpro"			1 "${EPREFIX}/usr"
	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_enable	"sysvshm"		"sysvipc"		1
	phpconfutils_extension_disable	"tokenizer"		"tokenizer"		0
	phpconfutils_extension_enable	"wddx"			"wddx"			1
	phpconfutils_extension_disable	"xml"			"expat"			0 "${EPREFIX}/usr"
	phpconfutils_extension_with	"xmlrpc"		"xmlrpc"		1
	phpconfutils_extension_with	"expat-dir"		"xmlrpc"		0 "${EPREFIX}/usr"
	phpconfutils_extension_with	"zlib"			"zlib"			1 "${EPREFIX}/usr"
	phpconfutils_extension_enable	"debug"			"debug"			0


Return to bug 195765

Lines 223-229 Link Here

(-)/Gentoo/usr/portage/eclass/php4_4-sapi.eclass (-9 / +12 lines)
223	destdir="${EPREFIX}"/usr/$(get_libdir)/php4	223	destdir="${EPREFIX}"/usr/$(get_libdir)/php4
224		224
225	# get the extension dir, if not already defined	225	# get the extension dir, if not already defined
226	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${ED}/${destdir}/bin/php-config" --extension-dir`"	226	[[ -z "${PHPEXTDIR}" ]] && PHPEXTDIR="`"${D}/${destdir}/bin/php-config" --extension-dir`"
227		227
228	# work out where we are installing the ini file	228	# work out where we are installing the ini file
229	php4_4-sapi_set_php_ini_dir	229	php4_4-sapi_set_php_ini_dir
Lines 241-247 Link Here
241		241
242	# Set the include path to point to where we want to find PEAR packages	242	# Set the include path to point to where we want to find PEAR packages
243	einfo "Setting correct include_path"	243	einfo "Setting correct include_path"
244	sed -e 's\|^;include_path = ".:/php/includes".*\|include_path = ".:${EPREFIX}/usr/share/php4:${EPREFIX}/usr/share/php"\|' -i ${phpinisrc}	244	sed -e "s\|^;include_path = \".:/php/includes\".*\|include_path = \".:${EPREFIX}/usr/share/php4:${EPREFIX}/usr/share/php\"\|" -i ${phpinisrc}
245		245
246	# Add needed MySQL extension charset configuration	246	# Add needed MySQL extension charset configuration
247	local phpmycnfcharset=""	247	local phpmycnfcharset=""
Lines 285-291 Link Here
285	for x in `ls "${D}/${PHPEXTDIR}/".so \| sort \| sed -e "s\|.java.*\|\|g"` ; do	285	for x in `ls "${D}/${PHPEXTDIR}/".so \| sort \| sed -e "s\|.java.*\|\|g"` ; do
286	inifilename=${x/.so/.ini}	286	inifilename=${x/.so/.ini}
287	inifilename=`basename ${inifilename}`	287	inifilename=`basename ${inifilename}`
288	echo "extension=`basename ${x}`" >> "${ED}/${PHP_EXT_INI_DIR}/${inifilename}"	288	echo "extension=`basename ${x}`" >> "${D}/${PHP_EXT_INI_DIR}/${inifilename}"
289	dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}"	289	dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}"
290	done	290	done
291	fi	291	fi
Lines 331-336 Link Here
331	# Apply general PHP4 patches	331	# Apply general PHP4 patches
332	if [[ -d "${WORKDIR}/${MY_PHP_PV}/php4" ]] ; then	332	if [[ -d "${WORKDIR}/${MY_PHP_PV}/php4" ]] ; then
333	EPATCH_SOURCE="${WORKDIR}/${MY_PHP_PV}/php4" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch	333	EPATCH_SOURCE="${WORKDIR}/${MY_PHP_PV}/php4" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
		334	# If we patch PHP for libtool compilation, we should patch it for libtool linking, too!
		335	epatch "${FILESDIR}/php4-libtool-1.5-linking.patch"
334	fi	336	fi
335		337
336	# Apply version-specific PHP patches	338	# Apply version-specific PHP patches
Lines 424-433 Link Here
424	phpconfutils_extension_with "iconv" "iconv" 0	426	phpconfutils_extension_with "iconv" "iconv" 0
425	phpconfutils_extension_with "informix" "informix" 1	427	phpconfutils_extension_with "informix" "informix" 1
426	phpconfutils_extension_disable "ipv6" "ipv6" 0	428	phpconfutils_extension_disable "ipv6" "ipv6" 0
427	phpconfutils_extension_with "kerberos" "kerberos" 0 "${EPREFIX}//usr"	429	phpconfutils_extension_with "kerberos" "kerberos" 0 "${EPREFIX}/usr"
428	phpconfutils_extension_enable "mbstring" "unicode" 1	430	phpconfutils_extension_enable "mbstring" "unicode" 1
429	phpconfutils_extension_with "mcal" "mcal" 1 "${EPREFIX}//usr"	431	phpconfutils_extension_with "mcal" "mcal" 1 "${EPREFIX}/usr"
430	phpconfutils_extension_with "mcrypt" "crypt" 1	432	phpconfutils_extension_with "mcrypt" "crypt" 1 "${EPREFIX}/usr"
431	phpconfutils_extension_with "mcve" "mcve" 1	433	phpconfutils_extension_with "mcve" "mcve" 1
432	phpconfutils_extension_enable "memory-limit" "memlimit" 0	434	phpconfutils_extension_enable "memory-limit" "memlimit" 0
433	phpconfutils_extension_with "mhash" "mhash" 1	435	phpconfutils_extension_with "mhash" "mhash" 1
Lines 435-441 Link Here
435	phpconfutils_extension_with "mnogosearch" "mnogosearch" 1	437	phpconfutils_extension_with "mnogosearch" "mnogosearch" 1
436	phpconfutils_extension_with "msql" "msql" 1	438	phpconfutils_extension_with "msql" "msql" 1
437	phpconfutils_extension_with "mssql" "mssql" 1	439	phpconfutils_extension_with "mssql" "mssql" 1
438	phpconfutils_extension_with "ncurses" "ncurses" 1	440	phpconfutils_extension_with "ncurses" "ncurses" 1 "${EPREFIX}/usr"
439	phpconfutils_extension_with "oci8" "oci8" 1 "${EPREFIX}/usr"	441	phpconfutils_extension_with "oci8" "oci8" 1 "${EPREFIX}/usr"
440	phpconfutils_extension_with "oci8-instant-client" "oci8-instant-client" 1	442	phpconfutils_extension_with "oci8-instant-client" "oci8-instant-client" 1
441	phpconfutils_extension_with "oracle" "oracle7" 1	443	phpconfutils_extension_with "oracle" "oracle7" 1
Lines 445-451 Link Here
445	phpconfutils_extension_enable "pcntl" "pcntl" 1	447	phpconfutils_extension_enable "pcntl" "pcntl" 1
446	phpconfutils_extension_without "pcre-regex" "pcre" 0	448	phpconfutils_extension_without "pcre-regex" "pcre" 0
447	phpconfutils_extension_with "pfpro" "pfpro" 1 "${EPREFIX}/usr"	449	phpconfutils_extension_with "pfpro" "pfpro" 1 "${EPREFIX}/usr"
448	phpconfutils_extension_with "pgsql" "postgres" 1	450	phpconfutils_extension_with "pgsql" "postgres" 1 "${EPREFIX}/usr"
449	phpconfutils_extension_disable "posix" "posix" 0	451	phpconfutils_extension_disable "posix" "posix" 0
450	phpconfutils_extension_with "pspell" "spell" 1 "${EPREFIX}/usr"	452	phpconfutils_extension_with "pspell" "spell" 1 "${EPREFIX}/usr"
451	phpconfutils_extension_with "recode" "recode" 1 "${EPREFIX}/usr"	453	phpconfutils_extension_with "recode" "recode" 1 "${EPREFIX}/usr"
Lines 459-466 Link Here
459	phpconfutils_extension_enable "sysvshm" "sysvipc" 1	461	phpconfutils_extension_enable "sysvshm" "sysvipc" 1
460	phpconfutils_extension_disable "tokenizer" "tokenizer" 0	462	phpconfutils_extension_disable "tokenizer" "tokenizer" 0
461	phpconfutils_extension_enable "wddx" "wddx" 1	463	phpconfutils_extension_enable "wddx" "wddx" 1
462	phpconfutils_extension_disable "xml" "expat" 0	464	phpconfutils_extension_disable "xml" "expat" 0 "${EPREFIX}/usr"
463	phpconfutils_extension_with "xmlrpc" "xmlrpc" 1	465	phpconfutils_extension_with "xmlrpc" "xmlrpc" 1
		466	phpconfutils_extension_with "expat-dir" "xmlrpc" 0 "${EPREFIX}/usr"
464	phpconfutils_extension_with "zlib" "zlib" 1 "${EPREFIX}/usr"	467	phpconfutils_extension_with "zlib" "zlib" 1 "${EPREFIX}/usr"
465	phpconfutils_extension_enable "debug" "debug" 0	468	phpconfutils_extension_enable "debug" "debug" 0
466		469