From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2493B138247 for ; Thu, 14 Nov 2013 06:20:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ADE5E0B5A; Thu, 14 Nov 2013 06:20:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B354BE0B00 for ; Thu, 14 Nov 2013 06:20:09 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96EA133F393 for ; Thu, 14 Nov 2013 06:20:08 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 714) id 22AEC2004B; Thu, 14 Nov 2013 06:20:07 +0000 (UTC) From: "Steve Arnold (nerdboy)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nerdboy@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: gnatbuild.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: gnatbuild.eclass X-VCS-Directories: eclass X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20131114062007.22AEC2004B@flycatcher.gentoo.org> Date: Thu, 14 Nov 2013 06:20:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5156b926-69d9-4f9e-ad11-87487279239e X-Archives-Hash: 6de600712e2ab4d2fea0125fe90edf05 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 # Belongs to: ada herd @@ -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)