| 1 |
george 08/08/19 11:39:57 |
| 2 |
|
| 3 |
Modified: gnatbuild.eclass |
| 4 |
Log: |
| 5 |
added changes to allow SLOT and BOOT_SLOT to be set in ebuild |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.42 eclass/gnatbuild.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.42&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.42&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.41&r2=1.42 |
| 13 |
|
| 14 |
Index: gnatbuild.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v |
| 17 |
retrieving revision 1.41 |
| 18 |
retrieving revision 1.42 |
| 19 |
diff -u -r1.41 -r1.42 |
| 20 |
--- gnatbuild.eclass 12 Aug 2008 09:26:19 -0000 1.41 |
| 21 |
+++ gnatbuild.eclass 19 Aug 2008 11:39:56 -0000 1.42 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2006 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.41 2008/08/12 09:26:19 george Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.42 2008/08/19 11:39:56 george Exp $ |
| 27 |
# |
| 28 |
# Author: George Shapovalov <george@g.o> |
| 29 |
# Belongs to: ada herd <ada@g.o> |
| 30 |
@@ -66,7 +66,10 @@ |
| 31 |
GCCRELEASE=$(get_version_component_range 1-3 "${GCCVER}") |
| 32 |
|
| 33 |
# SLOT logic, make it represent gcc backend, as this is what matters most |
| 34 |
-SLOT="${GCCBRANCH}" |
| 35 |
+# There are some special cases, so we allow it to be defined in the ebuild |
| 36 |
+# ATTN!! If you set SLOT in the ebuild, don't forget to make sure that |
| 37 |
+# BOOT_SLOT is also set properly! |
| 38 |
+[[ -z ${SLOT} ]] && SLOT="${GCCBRANCH}" |
| 39 |
|
| 40 |
# possible future crosscompilation support |
| 41 |
export CTARGET=${CTARGET:-${CHOST}} |
| 42 |
@@ -77,8 +80,9 @@ |
| 43 |
|
| 44 |
# Bootstrap CTARGET and SLOT logic. For now BOOT_TARGET=CHOST is "guaranteed" by |
| 45 |
# profiles, so mostly watch out for the right SLOT used in the bootstrap. |
| 46 |
+# As above, with SLOT, it may need to be defined in the ebuild |
| 47 |
BOOT_TARGET=${CTARGET} |
| 48 |
-BOOT_SLOT=${SLOT} |
| 49 |
+[[ -z ${BOOT_SLOT} ]] && BOOT_SLOT=${SLOT} |
| 50 |
|
| 51 |
# set our install locations |
| 52 |
PREFIX=${GNATBUILD_PREFIX:-/usr} # not sure we need this hook, but may be.. |
Archives