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

["Steve Arnold (nerdboy)" <nerdboy@gentoo.org>]

nerdboy     13/11/14 06:20:07

  Modified:             gnatbuild.eclass
  Log:
  updated gnatbuild for new ebuilds and lto use flag handling

Revision  Changes    Path
1.57                 eclass/gnatbuild.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnatbuild.eclass?r1=1.56&r2=1.57

Index: gnatbuild.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gnatbuild.eclass	2 Aug 2013 17:38:57 -0000	1.56
+++ gnatbuild.eclass	14 Nov 2013 06:20:06 -0000	1.57
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.56 2013/08/02 17:38:57 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.57 2013/11/14 06:20:06 nerdboy Exp $
 #
 # Author: George Shapovalov <george@gentoo.org>
 # Belongs to: ada herd <ada@gentoo.org>
@@ -485,12 +485,19 @@
 					confgcc="${confgcc} --disable-nls"
 				fi
 
+				if [ "${GNATMINOR}" -ge "6" ] ; then
+					confgcc+=( $(use_enable lto) )
+				elif [ "${GNATMINOR}" -ge "5" ] ; then
+					confgcc+=( --disable-lto )
+				fi
+
 				# reasonably sane globals (from toolchain)
 				# also disable mudflap and ssp
 				confgcc="${confgcc} \
 					--with-system-zlib \
 					--disable-checking \
 					--disable-werror \
+					--disable-libgomp \
 					--disable-libmudflap \
 					--disable-libssp \
 					--disable-libunwind-exceptions"
@@ -554,6 +561,11 @@
 				cp "${S}"/gcc/ada/xeinfo.adb   .
 				cp "${S}"/gcc/ada/xnmake.adb   .
 				cp "${S}"/gcc/ada/xutil.ad{s,b}   .
+				if [[ ${GNATMINOR} > 5 ]] ; then
+					cp "${S}"/gcc/ada/einfo.ad{s,b}  .
+					cp "${S}"/gcc/ada/csinfo.adb  .
+					cp "${S}"/gcc/ada/ceinfo.adb  .
+				fi
 				gnatmake xtreeprs && \
 				gnatmake xsinfo   && \
 				gnatmake xeinfo   && \
@@ -645,7 +657,7 @@
 		make DESTDIR="${D}" install || die
 
 		#make a convenience info link
-		dosym ${DATAPATH}/info/gnat_ugn_unw.info ${DATAPATH}/info/gnat.info
+		dosym ${DATAPATH}/info/gnat_ugn.info ${DATAPATH}/info/gnat.info
 		;;
 
 	move_libs)
@@ -713,6 +725,14 @@
 		# remove duplicate docs
 		rm -f  "${D}${DATAPATH}"/info/{dir,gcc,cpp}*
 		rm -rf "${D}${DATAPATH}"/man/man7/
+
+		# fix .la path for lto plugin
+		if use lto ; then
+			sed -i -e \
+				"/libdir=/c\libdir='${LIBEXECPATH}'" \
+				"${D}${LIBEXECPATH}"/liblto_plugin.la \
+				|| die "sed update of .la file failed!"
+		fi
 		;;
 
 	prep_env)