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

Collapse All | Expand All

(-)file_not_specified_in_diff (-7 / +6 lines)
Lines 45-52 PHP_P="${PN}-${PHP_PV}" Link Here
45
45
46
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
46
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
47
47
48
PHP_FPM_CONF_VER="1"
49
50
SRC_URI="${PHP_SRC_URI}"
48
SRC_URI="${PHP_SRC_URI}"
51
49
52
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
50
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
Lines 253-265 php_install_ini() { Link Here
253
	# SAPI-specific handling
251
	# SAPI-specific handling
254
252
255
	if [[ "${sapi}" == "fpm" ]] ; then
253
	if [[ "${sapi}" == "fpm" ]] ; then
256
		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
257
		einfo "Installing FPM CGI config file php-fpm.conf"
254
		einfo "Installing FPM CGI config file php-fpm.conf"
255
		dodir "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
258
		insinto "${PHP_INI_DIR#${EPREFIX}}"
256
		insinto "${PHP_INI_DIR#${EPREFIX}}"
259
		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
257
		newins "sapi/fpm/php-fpm.conf" php-fpm.conf
260
261
		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
262
		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
263
	fi
258
	fi
264
259
265
	# Install PHP ini files into /usr/share/php
260
	# Install PHP ini files into /usr/share/php
Lines 308-316 src_prepare() { Link Here
308
			|| die "Failed to fix heimdal crypt library reference"
303
			|| die "Failed to fix heimdal crypt library reference"
309
	fi
304
	fi
310
305
306
	epatch "${FILESDIR}/${PN}-fpm.conf.in.patch"
307
311
	#Add user patches #357637
308
	#Add user patches #357637
312
	epatch_user
309
	epatch_user
313
310
311
	sed -e "s|@SLOT@|${SLOT}|g" -i "sapi/fpm/php-fpm.conf.in"
312
314
	#force rebuilding aclocal.m4
313
	#force rebuilding aclocal.m4
315
	rm aclocal.m4
314
	rm aclocal.m4
316
	eautoreconf
315
	eautoreconf

Return to bug 559116