Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 371985
Collapse All | Expand All

(-)a/eclass/php-ext-source-r2.eclass (-9 / +10 lines)
Lines 191-198 php-ext-source-r2_src_install() { Link Here
191
	for slot in $(php_get_slots); do
191
	for slot in $(php_get_slots); do
192
		php_init_slot_env ${slot}
192
		php_init_slot_env ${slot}
193
193
194
		# Let's put the default module away
194
		# Let's put the default module away. Strip $EPREFIX from
195
		insinto "${EXT_DIR}"
195
		# $EXT_DIR before calling newins (which handles EPREFIX itself).
196
		insinto "${EXT_DIR#$EPREFIX}"
196
		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
197
		newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
197
198
198
		local doc
199
		local doc
Lines 217-228 php_get_slots() { Link Here
217
php_init_slot_env() {
218
php_init_slot_env() {
218
	libdir=$(get_libdir)
219
	libdir=$(get_libdir)
219
220
220
	PHPIZE="/usr/${libdir}/${1}/bin/phpize"
221
	PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize"
221
	PHPCONFIG="/usr/${libdir}/${1}/bin/php-config"
222
	PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config"
222
	PHPCLI="/usr/${libdir}/${1}/bin/php"
223
	PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php"
223
	PHPCGI="/usr/${libdir}/${1}/bin/php-cgi"
224
	PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi"
224
	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
225
	PHP_PKG="$(best_version =dev-lang/php-${1:3}*)"
225
	PHPPREFIX="/usr/${libdir}/${slot}"
226
	PHPPREFIX="${EPREFIX}}/usr/${libdir}/${slot}"
226
	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
227
	EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)"
227
	PHP_CURRENTSLOT=${1:3}
228
	PHP_CURRENTSLOT=${1:3}
228
229
Lines 239-245 php-ext-source-r2_buildinilist() { Link Here
239
	PHPINIFILELIST=""
240
	PHPINIFILELIST=""
240
	local x
241
	local x
241
	for x in ${PHPSAPILIST} ; do
242
	for x in ${PHPSAPILIST} ; do
242
		if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then
243
		if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then
243
			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
244
			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini"
244
		fi
245
		fi
245
	done
246
	done
Lines 281-287 php-ext-source-r2_createinifiles() { Link Here
281
		done
282
		done
282
283
283
		# Add support for installing PHP files into a version dependant directory
284
		# Add support for installing PHP files into a version dependant directory
284
		PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}"
285
		PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}"
285
	done
286
	done
286
}
287
}
287
288

Return to bug 371985