[gentoo-commits] gentoo-x86 commit in eclass: gnat.eclass

[George Shapovalov (george)]

george      07/12/29 23:41:30

  Modified:             gnat.eclass
  Log:
  actually added the rule enforcing that all primary compilers be present before Ada lib can be emerged (#151343)

Revision  Changes    Path
1.32                 eclass/gnat.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnat.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnat.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnat.eclass?r1=1.31&r2=1.32

Index: gnat.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gnat.eclass	27 Dec 2007 01:40:44 -0000	1.31
+++ gnat.eclass	29 Dec 2007 23:41:29 -0000	1.32
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.31 2007/12/27 01:40:44 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.32 2007/12/29 23:41:29 george Exp $
 #
 # Author: George Shapovalov <george@g.o>
 # Belongs to: ada herd <ada@g.o>
@@ -31,6 +31,9 @@
 # functions!
 GnatCommon="/usr/share/gnat/lib/gnat-common.bash"
 
+# !!NOTE!!
+# src_install should not be exported!
+# Instead gnat_src_install should be explicitly called from within src_install.
 EXPORT_FUNCTIONS pkg_setup pkg_postinst src_compile
 
 DESCRIPTION="Common procedures for building Ada libs using split gnat compilers"
@@ -269,6 +272,17 @@
 
 gnat_pkg_setup() {
 	debug-print-function $FUNCNAME $*
+
+	# check whether all the primary compilers are installed
+	. ${GnatCommon} || die "failed to source gnat-common lib"
+	for fn in $(cat ${PRIMELIST}); do
+		if [[ ! -f ${SPECSDIR}/${fn} ]]; then 
+			elog "The ${fn} Ada compiler profile is specified as primary, but is not installed."
+			elog "Please rectify the situation before emerging Ada library!"
+			die "Primary compiler is missing"
+		fi
+	done
+	
 	export ADAC=${ADAC:-gnatgcc}
 	export ADAMAKE=${ADAMAKE:-gnatmake}
 	export ADABIND=${ADABIND:-gnatbind}



-- 
gentoo-commits@g.o mailing list