diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2011-09-16 07:02:57 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2011-09-16 07:02:57 +0000 |
| commit | db8336a0aca70c3246be16314e7e585919a8858b (patch) | |
| tree | 7239047966d32879d6034c5e55c8af77ec247445 /dev-lang/php/files | |
| parent | Don't build examples (fixes bug #383115). (diff) | |
| download | historical-db8336a0aca70c3246be16314e7e585919a8858b.tar.gz historical-db8336a0aca70c3246be16314e7e585919a8858b.tar.bz2 historical-db8336a0aca70c3246be16314e7e585919a8858b.zip | |
Remove deps on phpconfutils and php-common-r1
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/php/files')
| -rw-r--r-- | dev-lang/php/files/eblits/src_configure-v3.eblit | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/src_install-v3.eblit | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dev-lang/php/files/eblits/src_configure-v3.eblit b/dev-lang/php/files/eblits/src_configure-v3.eblit index c99ed8888f68..a08d83955515 100644 --- a/dev-lang/php/files/eblits/src_configure-v3.eblit +++ b/dev-lang/php/files/eblits/src_configure-v3.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.4 2011/08/22 13:32:38 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.5 2011/09/16 07:02:57 olemarkus Exp $ eblit-php-src_configure() { addpredict /usr/share/snmp/mibs/.index @@ -214,7 +214,9 @@ eblit-php-src_configure() { my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" # Catch CFLAGS problems - php_check_cflags + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" # Support user-passed configuration parameters my_conf="${my_conf} ${EXTRA_ECONF:-}" diff --git a/dev-lang/php/files/eblits/src_install-v3.eblit b/dev-lang/php/files/eblits/src_install-v3.eblit index 19e4b89a359f..316d42b4cf41 100644 --- a/dev-lang/php/files/eblits/src_install-v3.eblit +++ b/dev-lang/php/files/eblits/src_install-v3.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.2 2011/07/20 12:41:38 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.3 2011/09/16 07:02:57 olemarkus Exp $ eblit-php-src_install() { # see bug #324739 for what happens when we don't have that @@ -26,9 +26,6 @@ eblit-php-src_install() { local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)" - # Generate the USE file for PHP - phpconfutils_generate_usefile - # Create the directory where we'll put version-specific php scripts keepdir /usr/share/php${PHP_MV} |