| 1 |
commit: 16e807c417f55f10416e059a451d3183c7ba81ad |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 10 20:08:05 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 10 20:08:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e807c4 |
| 7 |
|
| 8 |
dev-php/ming-php: Fix building with SYMLINK_LIB=no |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-php/ming-php/ming-php-0.4.7.ebuild | 8 ++++++-- |
| 13 |
dev-php/ming-php/ming-php-0.4.8.ebuild | 6 +++++- |
| 14 |
2 files changed, 11 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-php/ming-php/ming-php-0.4.7.ebuild b/dev-php/ming-php/ming-php-0.4.7.ebuild |
| 17 |
index e299530c8be..39946c8462e 100644 |
| 18 |
--- a/dev-php/ming-php/ming-php-0.4.7.ebuild |
| 19 |
+++ b/dev-php/ming-php/ming-php-0.4.7.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -24,11 +24,15 @@ DEPEND="${RDEPEND}" |
| 27 |
S="${WORKDIR}/libming-${MY_P}" |
| 28 |
|
| 29 |
src_prepare() { |
| 30 |
- local slot orig_s="${PHP_EXT_S}" |
| 31 |
+ local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) |
| 32 |
for slot in $(php_get_slots); do |
| 33 |
cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ |
| 34 |
die "Failed to copy config.m4 to target" |
| 35 |
rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" |
| 36 |
+ # Fix for SYMYLINK_LIB=no |
| 37 |
+ [[ ${libdir} != 'lib' ]] && \ |
| 38 |
+ sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ |
| 39 |
+ || die "Failed to update lib directory" |
| 40 |
php_init_slot_env ${slot} |
| 41 |
eapply -p0 "${FILESDIR}/ming-php-54.patch" |
| 42 |
eapply_user |
| 43 |
|
| 44 |
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild |
| 45 |
index 12bf8ee1dcc..b729af51dad 100644 |
| 46 |
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild |
| 47 |
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild |
| 48 |
@@ -26,11 +26,15 @@ S="${WORKDIR}/libming-${MY_P}" |
| 49 |
DOCS=( ) |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
- local slot orig_s="${PHP_EXT_S}" |
| 53 |
+ local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) |
| 54 |
for slot in $(php_get_slots); do |
| 55 |
cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ |
| 56 |
die "Failed to copy config.m4 to target" |
| 57 |
rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" |
| 58 |
+ # Fix for SYMYLINK_LIB=no |
| 59 |
+ [[ ${libdir} != 'lib' ]] && \ |
| 60 |
+ sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ |
| 61 |
+ || die "Failed to update lib directory" |
| 62 |
php_init_slot_env ${slot} |
| 63 |
eapply_user |
| 64 |
php-ext-source-r3_phpize |
Archives