| 1 |
commit: 1da1f7fe7ebc3a02ada674c2a65900ed076ae0a6 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 2 02:50:12 2020 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 2 02:50:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da1f7fe |
| 7 |
|
| 8 |
dev-lang/php: Fix installation of phar command |
| 9 |
|
| 10 |
Originally added in the wrong location as it requires the |
| 11 |
cli SAPI to be active |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/707876 |
| 14 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-lang/php/php-7.2.28-r1.ebuild | 8 +++++--- |
| 17 |
dev-lang/php/php-7.3.15-r1.ebuild | 8 +++++--- |
| 18 |
dev-lang/php/php-7.4.3-r1.ebuild | 8 +++++--- |
| 19 |
3 files changed, 15 insertions(+), 9 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/php/php-7.2.28-r1.ebuild b/dev-lang/php/php-7.2.28-r1.ebuild |
| 22 |
index b5a5a227589..3fbf7551268 100644 |
| 23 |
--- a/dev-lang/php/php-7.2.28-r1.ebuild |
| 24 |
+++ b/dev-lang/php/php-7.2.28-r1.ebuild |
| 25 |
@@ -530,9 +530,6 @@ src_install() { |
| 26 |
emake INSTALL_ROOT="${D}" \ |
| 27 |
install-build install-headers install-programs |
| 28 |
|
| 29 |
- # Install the "phar" archive utility. |
| 30 |
- use phar && emake INSTALL_ROOT="${D}" install-pharcmd |
| 31 |
- |
| 32 |
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" |
| 33 |
|
| 34 |
# Create the directory where we'll put version-specific php scripts |
| 35 |
@@ -560,6 +557,11 @@ src_install() { |
| 36 |
case "$sapi" in |
| 37 |
cli) |
| 38 |
source="sapi/cli/php" |
| 39 |
+ # Install the "phar" archive utility. |
| 40 |
+ if use phar ; then |
| 41 |
+ emake INSTALL_ROOT="${D}" install-pharcmd |
| 42 |
+ dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" |
| 43 |
+ fi |
| 44 |
;; |
| 45 |
cgi) |
| 46 |
source="sapi/cgi/php-cgi" |
| 47 |
|
| 48 |
diff --git a/dev-lang/php/php-7.3.15-r1.ebuild b/dev-lang/php/php-7.3.15-r1.ebuild |
| 49 |
index e2dc3f12050..186360d2ab6 100644 |
| 50 |
--- a/dev-lang/php/php-7.3.15-r1.ebuild |
| 51 |
+++ b/dev-lang/php/php-7.3.15-r1.ebuild |
| 52 |
@@ -531,9 +531,6 @@ src_install() { |
| 53 |
emake INSTALL_ROOT="${D}" \ |
| 54 |
install-build install-headers install-programs |
| 55 |
|
| 56 |
- # Install the "phar" archive utility. |
| 57 |
- use phar && emake INSTALL_ROOT="${D}" install-pharcmd |
| 58 |
- |
| 59 |
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" |
| 60 |
|
| 61 |
# Create the directory where we'll put version-specific php scripts |
| 62 |
@@ -561,6 +558,11 @@ src_install() { |
| 63 |
case "$sapi" in |
| 64 |
cli) |
| 65 |
source="sapi/cli/php" |
| 66 |
+ # Install the "phar" archive utility. |
| 67 |
+ if use phar ; then |
| 68 |
+ emake INSTALL_ROOT="${D}" install-pharcmd |
| 69 |
+ dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" |
| 70 |
+ fi |
| 71 |
;; |
| 72 |
cgi) |
| 73 |
source="sapi/cgi/php-cgi" |
| 74 |
|
| 75 |
diff --git a/dev-lang/php/php-7.4.3-r1.ebuild b/dev-lang/php/php-7.4.3-r1.ebuild |
| 76 |
index 97bb7fcbf21..4bc7906738b 100644 |
| 77 |
--- a/dev-lang/php/php-7.4.3-r1.ebuild |
| 78 |
+++ b/dev-lang/php/php-7.4.3-r1.ebuild |
| 79 |
@@ -521,9 +521,6 @@ src_install() { |
| 80 |
emake INSTALL_ROOT="${D}" \ |
| 81 |
install-build install-headers install-programs |
| 82 |
|
| 83 |
- # Install the "phar" archive utility. |
| 84 |
- use phar && emake INSTALL_ROOT="${D}" install-pharcmd |
| 85 |
- |
| 86 |
local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" |
| 87 |
|
| 88 |
# Create the directory where we'll put version-specific php scripts |
| 89 |
@@ -551,6 +548,11 @@ src_install() { |
| 90 |
case "$sapi" in |
| 91 |
cli) |
| 92 |
source="sapi/cli/php" |
| 93 |
+ # Install the "phar" archive utility. |
| 94 |
+ if use phar ; then |
| 95 |
+ emake INSTALL_ROOT="${D}" install-pharcmd |
| 96 |
+ dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" |
| 97 |
+ fi |
| 98 |
;; |
| 99 |
cgi) |
| 100 |
source="sapi/cgi/php-cgi" |
Archives