diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-01-10 15:08:05 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-01-10 15:08:05 -0500 |
| commit | 16e807c417f55f10416e059a451d3183c7ba81ad (patch) | |
| tree | e29644b3870296afbaf25073596e9ce63e442fc4 | |
| parent | dev-perl/Sub-Quote: keyworded 2.3.1 for sparc, bug #643980 (diff) | |
| download | gentoo-16e807c417f55f10416e059a451d3183c7ba81ad.tar.gz gentoo-16e807c417f55f10416e059a451d3183c7ba81ad.tar.bz2 gentoo-16e807c417f55f10416e059a451d3183c7ba81ad.zip | |
dev-php/ming-php: Fix building with SYMLINK_LIB=no
Package-Manager: Portage-2.3.19, Repoman-2.3.6
| -rw-r--r-- | dev-php/ming-php/ming-php-0.4.7.ebuild | 8 | ||||
| -rw-r--r-- | dev-php/ming-php/ming-php-0.4.8.ebuild | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dev-php/ming-php/ming-php-0.4.7.ebuild b/dev-php/ming-php/ming-php-0.4.7.ebuild index e299530c8bec..39946c8462e5 100644 --- a/dev-php/ming-php/ming-php-0.4.7.ebuild +++ b/dev-php/ming-php/ming-php-0.4.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,11 +24,15 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/libming-${MY_P}" src_prepare() { - local slot orig_s="${PHP_EXT_S}" + local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) for slot in $(php_get_slots); do cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ die "Failed to copy config.m4 to target" rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" + # Fix for SYMYLINK_LIB=no + [[ ${libdir} != 'lib' ]] && \ + sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ + || die "Failed to update lib directory" php_init_slot_env ${slot} eapply -p0 "${FILESDIR}/ming-php-54.patch" eapply_user diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild index 12bf8ee1dcc3..b729af51dadb 100644 --- a/dev-php/ming-php/ming-php-0.4.8.ebuild +++ b/dev-php/ming-php/ming-php-0.4.8.ebuild @@ -26,11 +26,15 @@ S="${WORKDIR}/libming-${MY_P}" DOCS=( ) src_prepare() { - local slot orig_s="${PHP_EXT_S}" + local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) for slot in $(php_get_slots); do cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ die "Failed to copy config.m4 to target" rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" + # Fix for SYMYLINK_LIB=no + [[ ${libdir} != 'lib' ]] && \ + sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ + || die "Failed to update lib directory" php_init_slot_env ${slot} eapply_user php-ext-source-r3_phpize |