* [gentoo-dev] [PATCH 0/2] Add prefix support to php-ext-source-r2.eclass.
@ 2015-08-26 2:19 Michael Orlitzky
2015-08-26 2:19 ` [gentoo-dev] [PATCH 1/2] php-ext-pecl-r2.eclass: fix eclass/function name comments Michael Orlitzky
2015-08-26 2:19 ` [gentoo-dev] [PATCH 2/2] php-ext-source-r2.eclass: add prefix support Michael Orlitzky
0 siblings, 2 replies; 3+ messages in thread
From: Michael Orlitzky @ 2015-08-26 2:19 UTC (permalink / raw
To: gentoo-dev
Add prefix support to php-ext-source-r2.eclass by prepending $EPREFIX
in a few places. The second patch does that, and the first patch fixes
some typos in php-ext-pecl-r2.eclass that were found in the process.
Michael Orlitzky (2):
php-ext-pecl-r2.eclass: fix eclass/function name comments.
php-ext-source-r2.eclass: add prefix support.
eclass/php-ext-pecl-r2.eclass | 8 ++++----
eclass/php-ext-source-r2.eclass | 19 ++++++++++---------
2 files changed, 14 insertions(+), 13 deletions(-)
--
2.4.6
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH 1/2] php-ext-pecl-r2.eclass: fix eclass/function name comments.
2015-08-26 2:19 [gentoo-dev] [PATCH 0/2] Add prefix support to php-ext-source-r2.eclass Michael Orlitzky
@ 2015-08-26 2:19 ` Michael Orlitzky
2015-08-26 2:19 ` [gentoo-dev] [PATCH 2/2] php-ext-source-r2.eclass: add prefix support Michael Orlitzky
1 sibling, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2015-08-26 2:19 UTC (permalink / raw
To: gentoo-dev
While investigating bug #371985, I took a look at the php-ext-pecl-r2
eclass. There's nothing to be done there for prefix support, but there
are a few places where the old revision "-r1" shows up in some
comments. This commit fixes them to "-r2".
Bug: 371985
Bug: 558612
---
eclass/php-ext-pecl-r2.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/php-ext-pecl-r2.eclass b/eclass/php-ext-pecl-r2.eclass
index 1357a09..c4e55ea 100644
--- a/eclass/php-ext-pecl-r2.eclass
+++ b/eclass/php-ext-pecl-r2.eclass
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-# @ECLASS: php-ext-pecl-r1.eclass
+# @ECLASS: php-ext-pecl-r2.eclass
# @MAINTAINER:
# Gentoo PHP team <php-bugs@gentoo.org>
# @AUTHOR:
@@ -62,14 +62,14 @@ SRC_URI="http://pecl.php.net/get/${FILENAME}"
HOMEPAGE="http://pecl.php.net/${PECL_PKG}"
-# @FUNCTION: php-ext-pecl-r1_src_compile
+# @FUNCTION: php-ext-pecl-r2_src_compile
# @DESCRIPTION:
# Takes care of standard compile for PECL packages.
php-ext-pecl-r2_src_compile() {
php-ext-source-r2_src_compile
}
-# @FUNCTION: php-ext-pecl-r1_src_install
+# @FUNCTION: php-ext-pecl-r2_src_install
# @DESCRIPTION:
# Takes care of standard install for PECL packages.
# You can also simply add examples to IUSE to automagically install
--
2.4.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH 2/2] php-ext-source-r2.eclass: add prefix support.
2015-08-26 2:19 [gentoo-dev] [PATCH 0/2] Add prefix support to php-ext-source-r2.eclass Michael Orlitzky
2015-08-26 2:19 ` [gentoo-dev] [PATCH 1/2] php-ext-pecl-r2.eclass: fix eclass/function name comments Michael Orlitzky
@ 2015-08-26 2:19 ` Michael Orlitzky
1 sibling, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2015-08-26 2:19 UTC (permalink / raw
To: gentoo-dev
The php-ext-source-r2 eclass sets a bunch of environment variables of
the form,
PHPIZE="/usr/${libdir}/${1}/bin/phpize"
and also tests for the existence of an INI file using absolute
paths. To accomodate a prefix environment, all of these paths need to
be prefixed with $EPREFIX. This commit adds the prefix to all absolute
paths in the eclass. We then need to strip $EPREFIX from one
invocation of `insinto` which handles $EPREFIX in its own way.
This has been tested on =dev-php/pecl-imagick-3.3.0_rc2 in a prefix
environment.
Bug: 371985
Bug: 481410
---
eclass/php-ext-source-r2.eclass | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
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
}
--
2.4.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-26 2:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-26 2:19 [gentoo-dev] [PATCH 0/2] Add prefix support to php-ext-source-r2.eclass Michael Orlitzky
2015-08-26 2:19 ` [gentoo-dev] [PATCH 1/2] php-ext-pecl-r2.eclass: fix eclass/function name comments Michael Orlitzky
2015-08-26 2:19 ` [gentoo-dev] [PATCH 2/2] php-ext-source-r2.eclass: add prefix support Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox