diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-11 09:12:41 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-11 09:12:41 +0000 |
| commit | 343a7272d559a21a0e0ed13cb743fabb2bfcc479 (patch) | |
| tree | db03f20672a6244296ccc2aa27e70757937eb9f7 /dev-php/ming-php | |
| parent | 456dbeaab3e2f71f527eae542ab44d1e372b0655 (diff) | |
gentoo resync : 11.01.2018
Diffstat (limited to 'dev-php/ming-php')
| -rw-r--r-- | dev-php/ming-php/Manifest | 4 | ||||
| -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 |
3 files changed, 13 insertions, 5 deletions
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest index 481b44682804..47ffb38a7502 100644 --- a/dev-php/ming-php/Manifest +++ b/dev-php/ming-php/Manifest @@ -2,6 +2,6 @@ AUX ming-php-54.patch 17283 BLAKE2B 9508565a0663a359bed955ecedf502df8e7c3c67afed AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f387160133312b96f5a8101cea87125d03eafbfdef7ede77b2a85dd0b32d428e6c78019a4a3d2c84f9cd05 SHA512 88e3eb6f42c38d66c050c3e6c956e239861b8c17ed7f7c4867be00b06c9b48b806af3254bd8fbd4c7349a4ff41981bfcb1c7256d671dc5b8bf6d0089d8bf62cc DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0 -EBUILD ming-php-0.4.7.ebuild 1231 BLAKE2B a6e7452a57bfe682e650bb38da96c950ad82e43b92e66a44e7557f42403a4fec99ab97e7569c2beca6263bf42cd6b474326f5be6970cb30b19da67679a959e37 SHA512 dde2c500e8859bbe3cbef3d4f338a0aeac424236ba895801941657eeb9d8b8c87f00cda8248b6ac8860c02e5a6b53d814ead2ad40a92c993445e8ded75d9af2d -EBUILD ming-php-0.4.8.ebuild 1295 BLAKE2B 66de643ff97a52109dab4e8893e7f36d5b05cce40e271db574d762677352480c92460674a8fe604e263fc41d662c5157f168a2a88635de2ac54b760085770ae0 SHA512 05bb434a306c29dc34a1369bc3e0455012c8381c14196ebe58742aa8e0d76049a7f97632104bfeb719b307190f302fc01dd399a8c87d7cb97018cb4fb4a5dc7e +EBUILD ming-php-0.4.7.ebuild 1441 BLAKE2B 91917ba6f913620bbea05084f9e4c62426429355ced51bf60cd5ec88fc8fb317304aeb7cabe6783c5cf2493b996f104d68a7619e4734aa2ab347e2fd58fa0885 SHA512 f2c8e1c7a2174ec9e9a91facac0185fcca06df8c9475970612dc391f964803c84bb7b62d521217a865be0dc58ff47f334c647c51663e11bdb61c0f6690443ccd +EBUILD ming-php-0.4.8.ebuild 1505 BLAKE2B 456da6d7f0e6b49236419c036975a3768744a2871298ace4c044ee779e61be85f097b6570324ec9468781e0b1f2679434a1813d55f7c40f2375478b25f4c8e78 SHA512 bf590ef7dfd9cacc97690bcccb8f5b41a9d6e07330acca31bb5c39519ee01da9ca8c722a100a37155c9b99c1955bd28af05ec739923046bc367034e9201eefb3 MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4 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 |