commit: c3cb4d33139f1fb08db747a540f08149b33090b8
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 18:17:00 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 18:17:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3cb4d33
dev-lang/gnat-gpl: build with out of path compiler
remove mirror from thirdpartmirros
Package-Manager: portage-2.3.3
dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 38 ++++++++++++++++++++++++----------
profiles/thirdpartymirrors | 1 -
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
index 00fb2c06ba9..77ac3e15dcd 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
@@ -29,13 +29,16 @@ MYP=gcc-${REL}-gpl-${PV}-src
DESCRIPTION="GNAT Ada Compiler - GPL version"
HOMEPAGE="http://libre.adacore.com/";
-SRC_URI+=" mirror://libreadacore/57399304c7a447658e0aff7f -> ${P}-src.tar.gz
- mirror://libreadacore/573992d4c7a447658d00e1db -> ${MYP}.tar.gz
- mirror://libreadacore/57399232c7a447658e0aff7d
- -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
+SRC_URI+="
+ http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
+ -> ${P}-src.tar.gz
+ http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db
+ -> ${MYP}.tar.gz
+ http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
+ -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
LICENSE+=" GPL-2 GPL-3"
-SLOT="${PV}"
+SLOT="${TOOLCHAIN_GCC_PV}"
KEYWORDS="~amd64"
RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -54,8 +57,11 @@ GCC_A_FAKEIT="${P}-src.tar.gz
pkg_setup() {
GCC=${ADA:-$(tc-getCC)}
- local gnatmake=${GCC/gcc/gnatmake}
- if [[ -z "$(type ${gnatmake} 2>/dev/null)" ]] ; then
+ local path=$(dirname ${GCC})
+ local base=$(basename ${GCC})
+ GNATMAKE="${path}/${base/gcc/gnatmake}"
+ GNATBIND="${path}/${base/gcc/gnatbind}"
+ if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
eerror "You need a gcc compiler that provides the Ada Compiler:"
eerror "1) use gcc-config to select the right compiler or"
eerror "2) set the ADA variable to the c/c++/ada compiler"
@@ -67,6 +73,14 @@ src_prepare() {
mv ../gnat-gpl-${PV}-src/src/ada gcc/ || die
mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
+ sed -i \
+ -e "s:gnatmake:${GNATMAKE}:g" \
+ gcc/ada/Make-generated.in || die "sed failed"
+
+ sed -i \
+ -e "/xoscons/s:gnatmake:${GNATMAKE}:g" \
+ gcc/ada/gcc-interface/Makefile.in || die "sed failed"
+
mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die
mv ../${FSFGCC}/libjava . || die
rm -r ../${FSFGCC} || die
@@ -91,10 +105,12 @@ src_prepare() {
}
src_configure() {
- export PATH=/opt/gnat-gpl-bin-2016/bin:${PATH}
- export PATH=/opt/gnat-gpl-bin-2015/bin:${PATH}
- export PATH=/opt/gnat-gpl-bin-2014/bin:${PATH}
- toolchain_src_configure --enable-languages=ada --disable-libada
+ toolchain_src_configure \
+ --enable-languages=ada \
+ --disable-libada \
+ CC=${GCC} \
+ GNATBIND=${GNATBIND} \
+ GNATMAKE=yes
}
src_compile() {
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 100426746d0..d7347147bd1 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -19,7 +19,6 @@ idsoftware ftp://ftp.idsoftware.com/idstuff
ftp://dl.xs4all.nl/pub/mirror/idsoft
imagemagick http://mirrors-au.go-parts.com/mirrors/ImageMagick/
ftp://mirrors-au.go-parts.com/mirrors/ImageMagick/
ftp://mirror.aarnet.edu.au/pub/imagemagick/
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/
http://servingzone.com/mirrors/ImageMagick/
http://mirrors.linsrv.net/ImageMagick ftp://mirrors.linsrv.net/pub/ImageMagick
http://mirror.checkdomain.de/imagemagick/
ftp://mirror.checkdomain.de/imagemagick/ http://imagemagick.spd.co.il/
ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org
http://www.champground.com/imagemagick/ ftp://ftp.nluug.nl/pub/ImageMagick
http://ftp.surfnet.nl/pub/ImageMagick/
http://mirror.searchdaimon.com/ImageMagick/
ftp://sunsite.icm.edu.pl/packages/ImageMagick/
ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/
http://mirrors-ru.go-parts.com/mirrors/ImageMagick/
ftp://mirrors-ru.go-parts.com/mirrors/ImageMagick/
ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick
http://mirror.is.co.za/pub/ima
gemagick/ ftp://ftp.is.co.za/pub/imagemagick
http://mirrors-uk.go-parts.com/mirrors/ImageMagick/
ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/
http://mirrors-usa.go-parts.com/mirrors/ImageMagick/
ftp://mirrors-usa.go-parts.com/mirrors/ImageMagick/
http://www.imagemagick.org/download ftp://ftp.fifi.org/pub/ImageMagick/
kde https://download.kde.org http://mirror.csclub.uwaterloo.ca/kde
ftp://mirrors.dotsrc.org/kde ftp://kde.mirror.anlx.net
kernel http://www.kernel.org/pub
-libreadacore http://mirrors.cdn.adacore.com/art/
lokigames http://updates.lokigames.com
mplayer http://www1.mplayerhq.hu/MPlayer
http://www2.mplayerhq.hu/MPlayer http://www5.mplayerhq.hu/MPlayer
http://www7.mplayerhq.hu/MPlayer http://www8.mplayerhq.hu/MPlayer
ftp://ftp1.mplayerhq.hu/MPlayer/ ftp://ftp6.mplayerhq.hu/MPlayer/
ftp://ftp7.mplayerhq.hu/MPlayer/ ftp://ftp8.mplayerhq.hu/MPlayer/
mysql http://gd.tuwien.ac.at/db/mysql/
ftp://gd.tuwien.ac.at/db/mysql/ http://mysql.mirror.kangaroot.net/
ftp://mysql.mirror.kangaroot.net/pub/mysql/ http://mysql.blic.net/
http://mysql.online.bg/ ftp://mysql.online.bg/ http://mysql.linux.cz/
ftp://ftp.fi.muni.cz/pub/mysql/ http://mirrors.dotsrc.org/mysql/
ftp://mirrors.dotsrc.org/mysql/ http://mirrors.ircam.fr/pub/mysql/
ftp://mirrors.ircam.fr/pub/mysql/
http://sunsite.informatik.rwth-aachen.de/mysql/
ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/
http://ftp.gwdg.de/pub/misc/mysql/ ftp://ftp.gwdg.de/pub/misc/mysql/
ftp://ftp.fu-berlin.de/unix/databases/mysql/
http://mysql.mirrors.ovh.net/ftp.mysql.com/
ftp://mysql.mirrors.ovh.net/ftp.mysql.com/
http://ftp.ntua.gr/pub/databases/mysql/ ftp://ftp.ntua.gr/pub/databases/mysql/
http://mysql.mirrors.crysys.hit.bme.hu/ ftp://ftp.crysys.hu/pub/mysql/
http://ftp.heanet.ie/mirrors/www.mysql.com/
ftp://ftp.heanet.ie/mirrors/www.mysql.com/ http://na.mirror.garr.it/mirrors/My
SQL/ ftp://na.mirror.garr.it/mirrors/MySQL/ http://mirror.leaseweb.com/mysql/
ftp://mirror.leaseweb.com/mysql/ http://sunsite.icm.edu.pl/mysql/
ftp://sunsite.icm.edu.pl/pub/unix/mysql/ http://mysql.nfsi.pt/
ftp://ftp.nfsi.pt/pub/mysql/ http://mirrors.xservers.ro/mysql/
http://ftp.arnes.si/mysql/ ftp://ftp.arnes.si/packages/mysql/
http://ftp.sunet.se/pub/unix/databases/relational/mysql/
ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/
http://mirror.switch.ch/ftp/mirror/mysql/ ftp://mirror.switch.ch/mirror/mysql/
http://ftp.itu.edu.tr/Mirror/Mysql/ ftp://ftp.itu.edu.tr/Mirror/Mysql/
http://www.mirrorservice.org/sites/ftp.mysql.com/
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/
http://mirrors.dedipower.com/www.mysql.com/
http://mirrors.ukfast.co.uk/sites/ftp.mysql.com/
ftp://mirrors.ukfast.co.uk/ftp.mysql.com/
http://mirror.csclub.uwaterloo.ca/mysql/
ftp://mirror.csclub.uwaterloo.ca/mysql/ http://mysql.mirror.rafal.ca/
ftp://mysql.mirror.rafal.ca/pub/mysql/ http://opensource.
become.com/mysql/ http://mysql.mirrors.hoobly.com/ http://mysql.he.net/
http://mirror.trouble-free.net/mysql_mirror/ http://mysql.llarian.net/
ftp://mysql.llarian.net/pub/mysql ftp://mirror.anl.gov/pub/mysql/
http://mysql.mirrors.pair.com/ ftp://ftp.linorg.usp.br/mysql/
http://linorg.usp.br/mysql ftp://linorg.usp.br/mysql
http://mysql.mirrors.arminco.com/ http://mysql.spd.co.il/
http://ftp.iij.ad.jp/pub/db/mysql/ ftp://ftp.iij.ad.jp/pub/db/mysql/
http://ftp.jaist.ac.jp/pub/mysql/ ftp://ftp.jaist.ac.jp/pub/mysql/
http://mysql.cdpa.nsysu.edu.tw/
ftp://mysql.cdpa.nsysu.edu.tw/Unix/Database/MySQL/
http://mysql.mirrors.ilisys.com.au/ http://mysql.inspire.net.nz/
ftp://mysql.inspire.net.nz/mysql/
