| 1 |
george 08/12/05 08:36:00 |
| 2 |
|
| 3 |
Modified: gnatbuild.eclass |
| 4 |
Log: |
| 5 |
prepating for new bootstraps with simplified structure |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.44 eclass/gnatbuild.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.44&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.44&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.43&r2=1.44 |
| 13 |
|
| 14 |
Index: gnatbuild.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v |
| 17 |
retrieving revision 1.43 |
| 18 |
retrieving revision 1.44 |
| 19 |
diff -u -r1.43 -r1.44 |
| 20 |
--- gnatbuild.eclass 29 Nov 2008 00:46:02 -0000 1.43 |
| 21 |
+++ gnatbuild.eclass 5 Dec 2008 08:36:00 -0000 1.44 |
| 22 |
@@ -1,12 +1,19 @@ |
| 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.43 2008/11/29 00:46:02 george Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.44 2008/12/05 08:36:00 george Exp $ |
| 27 |
# |
| 28 |
# Author: George Shapovalov <george@g.o> |
| 29 |
# Belongs to: ada herd <ada@g.o> |
| 30 |
# |
| 31 |
-# Note: HOMEPAGE and LICENSE are set in appropriate ebuild, as |
| 32 |
-# gnat is developed by FSF and AdaCore "in parallel" |
| 33 |
+# Notes: |
| 34 |
+# HOMEPAGE and LICENSE are set in appropriate ebuild, as |
| 35 |
+# gnat is developed by FSF and AdaCore "in parallel" |
| 36 |
+# |
| 37 |
+# The following vars can be set in ebuild before inheriting this eclass. They |
| 38 |
+# will be respected: |
| 39 |
+# SLOT |
| 40 |
+# BOOT_SLOT - where old bootstrap is used as it works fine |
| 41 |
+ |
| 42 |
|
| 43 |
inherit eutils versionator toolchain-funcs flag-o-matic multilib autotools \ |
| 44 |
libtool fixheadtails gnuconfig pax-utils |
| 45 |
@@ -409,10 +416,14 @@ |
| 46 |
else |
| 47 |
# Set some paths to our bootstrap compiler. |
| 48 |
export PATH="${GNATBOOT}/bin:${PATH}" |
| 49 |
- # !ATTN! the *installed* compilers have ${PN} as part of their |
| 50 |
- # LIBPATH, while the *bootstrap* uses hardset "gnatgcc" in theirs |
| 51 |
- # (which is referenced as GNATLIB below) |
| 52 |
- GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}" |
| 53 |
+ # !ATTN! the bootstrap compilers have a very simplystic structure, |
| 54 |
+ # so many paths are not identical to the installed ones. |
| 55 |
+ # Plus it was simplified even more in new releases. |
| 56 |
+ if [[ ${BOOT_SLOT} > 4.1 ]] ; then |
| 57 |
+ GNATLIB="${GNATBOOT}/lib" |
| 58 |
+ else |
| 59 |
+ GNATLIB="${GNATBOOT}/lib/gnatgcc/${BOOT_TARGET}/${BOOT_SLOT}" |
| 60 |
+ fi |
| 61 |
|
| 62 |
export CC="${GNATBOOT}/bin/gnatgcc" |
| 63 |
export INCLUDE_DIR="${GNATLIB}/include" |
| 64 |
@@ -494,13 +505,13 @@ |
| 65 |
# Compile helper tools |
| 66 |
cd "${GNATBOOT}" |
| 67 |
cp "${S}"/gcc/ada/xtreeprs.adb . |
| 68 |
- cp "${S}"/gcc/ada/xsinfo.adb . |
| 69 |
- cp "${S}"/gcc/ada/xeinfo.adb . |
| 70 |
- cp "${S}"/gcc/ada/xnmake.adb . |
| 71 |
+ cp "${S}"/gcc/ada/xsinfo.adb . |
| 72 |
+ cp "${S}"/gcc/ada/xeinfo.adb . |
| 73 |
+ cp "${S}"/gcc/ada/xnmake.adb . |
| 74 |
gnatmake xtreeprs && \ |
| 75 |
- gnatmake xsinfo && \ |
| 76 |
- gnatmake xeinfo && \ |
| 77 |
- gnatmake xnmake || die "building helper tools" |
| 78 |
+ gnatmake xsinfo && \ |
| 79 |
+ gnatmake xeinfo && \ |
| 80 |
+ gnatmake xnmake || die "building helper tools" |
| 81 |
;; |
| 82 |
|
| 83 |
bootstrap) |
Archives