| 1 |
hoffie 08/04/16 18:14:51 |
| 2 |
|
| 3 |
Modified: php5_2-sapi.eclass |
| 4 |
Log: |
| 5 |
php: fixing autotools usage (use eautoreconf instead of calling binaries directly), bug 215027 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.20 eclass/php5_2-sapi.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.20&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?rev=1.20&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/php5_2-sapi.eclass?r1=1.19&r2=1.20 |
| 13 |
|
| 14 |
Index: php5_2-sapi.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v |
| 17 |
retrieving revision 1.19 |
| 18 |
retrieving revision 1.20 |
| 19 |
diff -u -r1.19 -r1.20 |
| 20 |
--- php5_2-sapi.eclass 3 Mar 2008 20:49:07 -0000 1.19 |
| 21 |
+++ php5_2-sapi.eclass 16 Apr 2008 18:14:51 -0000 1.20 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.19 2008/03/03 20:49:07 hoffie Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_2-sapi.eclass,v 1.20 2008/04/16 18:14:51 hoffie Exp $ |
| 27 |
|
| 28 |
# ======================================================================== |
| 29 |
# Based on robbat2's work on the php4 sapi eclass |
| 30 |
@@ -387,21 +387,14 @@ |
| 31 |
fi |
| 32 |
fi |
| 33 |
|
| 34 |
- # Fix configure scripts to correctly support Suhosin |
| 35 |
- einfo "Running aclocal" |
| 36 |
- aclocal --force || die "Unable to run aclocal successfully" |
| 37 |
- einfo "Running libtoolize" |
| 38 |
- libtoolize --copy --force || die "Unable to run libtoolize successfully" |
| 39 |
- |
| 40 |
- # Rebuild configure to make sure it's up to date |
| 41 |
- einfo "Rebuilding configure script" |
| 42 |
- autoreconf --force -W no-cross || die "Unable to regenerate configure script successfully" |
| 43 |
+ # We are heavily patching autotools base files (configure.in) because |
| 44 |
+ # of suhosin etc., so let's regenerate the whole stuff now |
| 45 |
|
| 46 |
- # Run elibtoolize |
| 47 |
- elibtoolize |
| 48 |
+ # eaclocal doesn't accept --force, so we try to force re-generation |
| 49 |
+ # this way |
| 50 |
+ rm aclocal.m4 |
| 51 |
+ eautoreconf --force -W no-cross |
| 52 |
|
| 53 |
- # Just in case ;-) |
| 54 |
- chmod 0755 configure || die "Failed to chmod configure to 0755" |
| 55 |
} |
| 56 |
|
| 57 |
# @FUNCTION: php5_2-sapi_src_compile |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
-- |
| 62 |
gentoo-commits@l.g.o mailing list |
Archives