Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 180556 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/dev-lang/php/php-5.2.2-r1.ebuild (-5 / +5 lines)
Lines 20-27 Link Here
20
PHP_PACKAGE="1"
20
PHP_PACKAGE="1"
21
21
22
# php patch settings, general
22
# php patch settings, general
23
PHP_PATCHSET_REV="2"
23
PHP_PATCHSET_REV="1"
24
SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2-gentoo.patch.gz"
24
SUHOSIN_PATCH="suhosin-patch-${MY_PHP_PV}-0.9.6.2.patch.gz"
25
MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
25
MULTILIB_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-multilib-search-path.patch"
26
# php patch settings, ebuild specific
26
# php patch settings, ebuild specific
27
FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
27
FASTBUILD_PATCH="${MY_PHP_PV}/opt/php${MY_PHP_PV}-fastbuild.patch"
Lines 254-261 Link Here
254
		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
254
		for x in main/main.o main/main.lo main/php_ini.o main/php_ini.lo ; do
255
			[[ -f ${x} ]] && rm -f ${x}
255
			[[ -f ${x} ]] && rm -f ${x}
256
		done
256
		done
257
		make sapi/cgi/php || die "Unable to make CGI SAPI"
257
		make sapi/cgi/php-cgi || die "Unable to make CGI SAPI"
258
		cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
258
		cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
259
	fi
259
	fi
260
260
261
	if [[ ${build_apache2} = 1 ]] ; then
261
	if [[ ${build_apache2} = 1 ]] ; then
Lines 319-325 Link Here
319
				phpconfutils_extension_enable "discard-path" "discard-path" 0
319
				phpconfutils_extension_enable "discard-path" "discard-path" 0
320
				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
320
				phpconfutils_extension_enable "force-cgi-redirect" "force-cgi-redirect" 0
321
				php5_2-sapi_src_compile
321
				php5_2-sapi_src_compile
322
				cp sapi/cgi/php php-cgi || die "Unable to copy CGI SAPI"
322
				cp sapi/cgi/php-cgi php-cgi || die "Unable to copy CGI SAPI"
323
				;;
323
				;;
324
			apache2)
324
			apache2)
325
				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"
325
				my_conf="${my_conf} --disable-cli --with-apxs2=/usr/sbin/apxs2"

Return to bug 180556