Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 410152 Details for
Bug 371985
dev-php5/pecl-imagick: add prefix support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
php-ext-source-r2.eclass-prefix.diff
php-ext-source-r2.eclass-prefix.diff (text/plain), 1.89 KB, created by
Michael Orlitzky
on 2015-08-24 17:08:30 UTC
(
hide
)
Description:
php-ext-source-r2.eclass-prefix.diff
Filename:
MIME Type:
Creator:
Michael Orlitzky
Created:
2015-08-24 17:08:30 UTC
Size:
1.89 KB
patch
obsolete
>diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass >index 17073a9..ad82fee 100644 >--- a/eclass/php-ext-source-r2.eclass >+++ b/eclass/php-ext-source-r2.eclass >@@ -191,8 +191,9 @@ php-ext-source-r2_src_install() { > for slot in $(php_get_slots); do > php_init_slot_env ${slot} > >- # Let's put the default module away >- insinto "${EXT_DIR}" >+ # Let's put the default module away. Strip $EPREFIX from >+ # $EXT_DIR before calling newins (which handles EPREFIX itself). >+ insinto "${EXT_DIR#$EPREFIX}" > newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" > > local doc >@@ -217,12 +218,12 @@ php_get_slots() { > php_init_slot_env() { > libdir=$(get_libdir) > >- PHPIZE="/usr/${libdir}/${1}/bin/phpize" >- PHPCONFIG="/usr/${libdir}/${1}/bin/php-config" >- PHPCLI="/usr/${libdir}/${1}/bin/php" >- PHPCGI="/usr/${libdir}/${1}/bin/php-cgi" >+ PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize" >+ PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config" >+ PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php" >+ PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi" > PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" >- PHPPREFIX="/usr/${libdir}/${slot}" >+ PHPPREFIX="${EPREFIX}}/usr/${libdir}/${slot}" > EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" > PHP_CURRENTSLOT=${1:3} > >@@ -239,7 +240,7 @@ php-ext-source-r2_buildinilist() { > PHPINIFILELIST="" > local x > for x in ${PHPSAPILIST} ; do >- if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then >+ if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then > PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini" > fi > done >@@ -281,7 +282,7 @@ php-ext-source-r2_createinifiles() { > done > > # Add support for installing PHP files into a version dependant directory >- PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}" >+ PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}" > done > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 371985
:
410150
| 410152