| 1 |
vapier 08/06/23 01:39:13 |
| 2 |
|
| 3 |
Modified: src_compile.eblit src_install.eblit |
| 4 |
Log: |
| 5 |
Short circuit header building in pkg testing and ABI recursion. |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sys-libs/glibc/files/eblits/src_compile.eblit |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: src_compile.eblit |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- src_compile.eblit 18 Nov 2007 03:49:32 -0000 1.3 |
| 22 |
+++ src_compile.eblit 23 Jun 2008 01:39:13 -0000 1.4 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.3 2007/11/18 03:49:32 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.4 2008/06/23 01:39:13 vapier Exp $ |
| 28 |
|
| 29 |
glibc_do_configure() { |
| 30 |
local myconf |
| 31 |
@@ -151,6 +151,11 @@ |
| 32 |
} |
| 33 |
|
| 34 |
eblit-glibc-src_compile() { |
| 35 |
+ if just_headers ; then |
| 36 |
+ toolchain-glibc_headers_compile |
| 37 |
+ return |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
setup_env |
| 41 |
|
| 42 |
if [[ -z ${OABI} ]] ; then |
| 43 |
@@ -173,9 +178,5 @@ |
| 44 |
fi |
| 45 |
fi |
| 46 |
|
| 47 |
- if just_headers ; then |
| 48 |
- toolchain-glibc_headers_compile |
| 49 |
- else |
| 50 |
- toolchain-glibc_src_compile |
| 51 |
- fi |
| 52 |
+ toolchain-glibc_src_compile |
| 53 |
} |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.6 sys-libs/glibc/files/eblits/src_install.eblit |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.6&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.6&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.5&r2=1.6 |
| 62 |
|
| 63 |
Index: src_install.eblit |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v |
| 66 |
retrieving revision 1.5 |
| 67 |
retrieving revision 1.6 |
| 68 |
diff -u -r1.5 -r1.6 |
| 69 |
--- src_install.eblit 23 Mar 2008 18:06:18 -0000 1.5 |
| 70 |
+++ src_install.eblit 23 Jun 2008 01:39:13 -0000 1.6 |
| 71 |
@@ -1,6 +1,6 @@ |
| 72 |
# Copyright 1999-2007 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.5 2008/03/23 18:06:18 vapier Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.6 2008/06/23 01:39:13 vapier Exp $ |
| 76 |
|
| 77 |
toolchain-glibc_src_install() { |
| 78 |
# These should not be set, else the |
| 79 |
@@ -218,6 +218,11 @@ |
| 80 |
} |
| 81 |
|
| 82 |
eblit-glibc-src_install() { |
| 83 |
+ if just_headers ; then |
| 84 |
+ toolchain-glibc_headers_install |
| 85 |
+ return |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
setup_env |
| 89 |
|
| 90 |
if [[ -z ${OABI} ]] ; then |
| 91 |
@@ -241,10 +246,6 @@ |
| 92 |
fi |
| 93 |
fi |
| 94 |
|
| 95 |
- if just_headers ; then |
| 96 |
- toolchain-glibc_headers_install |
| 97 |
- else |
| 98 |
- toolchain-glibc_src_install |
| 99 |
- fi |
| 100 |
+ toolchain-glibc_src_install |
| 101 |
[[ -z ${OABI} ]] && src_strip |
| 102 |
} |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
-- |
| 107 |
gentoo-commits@l.g.o mailing list |
Archives