| 1 |
commit: cea81d0f521d474af7a09b0df8fd2dfeefd46ae6 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 27 07:05:50 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 27 07:05:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea81d0f |
| 7 |
|
| 8 |
dev-ada/gprbuild: Add use flags gnat_2016 & gnat_2017 to 2016 version too |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ada/gprbuild/gprbuild-2016.ebuild | 38 ++++++++++++++--------------------- |
| 13 |
dev-ada/gprbuild/gprbuild-2017.ebuild | 7 +++---- |
| 14 |
2 files changed, 18 insertions(+), 27 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild |
| 17 |
index c880ef95b51..60d1b029292 100644 |
| 18 |
--- a/dev-ada/gprbuild/gprbuild-2016.ebuild |
| 19 |
+++ b/dev-ada/gprbuild/gprbuild-2016.ebuild |
| 20 |
@@ -15,35 +15,28 @@ SRC_URI=" |
| 21 |
bootstrap? ( |
| 22 |
http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 |
| 23 |
-> xmlada-gpl-${PV}-src.tar.gz )" |
| 24 |
- |
| 25 |
LICENSE="GPL-3" |
| 26 |
SLOT="0" |
| 27 |
KEYWORDS="~amd64" |
| 28 |
-IUSE="bootstrap +shared static static-pic" |
| 29 |
+IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" |
| 30 |
|
| 31 |
-DEPEND="dev-lang/gnat-gpl:= |
| 32 |
- !bootstrap? ( dev-ada/xmlada )" |
| 33 |
+DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) |
| 34 |
+ gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 35 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" |
| 36 |
RDEPEND="${DEPEND}" |
| 37 |
|
| 38 |
S="${WORKDIR}"/${MYP}-src |
| 39 |
|
| 40 |
-REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" |
| 41 |
+REQUIRED_USE="bootstrap? ( !shared !static !static-pic ) |
| 42 |
+ ^^ ( gnat_2016 gnat_2017 )" |
| 43 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 44 |
|
| 45 |
-pkg_setup() { |
| 46 |
- GCC=${ADA:-$(tc-getCC)} |
| 47 |
- GNATMAKE="${GCC/gcc/gnatmake}" |
| 48 |
- if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then |
| 49 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
| 50 |
- eerror "1) use gcc-config to select the right compiler or" |
| 51 |
- eerror "2) set ADA=gcc-4.9.4 in make.conf" |
| 52 |
- die "ada compiler not available" |
| 53 |
- fi |
| 54 |
-} |
| 55 |
- |
| 56 |
src_prepare() { |
| 57 |
- gnatbase=$(basename ${GCC}) |
| 58 |
- GCC_PV=${gnatbase#*gcc-} |
| 59 |
+ if use gnat_2016; then |
| 60 |
+ GCC_PV=4.9.4 |
| 61 |
+ else |
| 62 |
+ GCC_PV=6.3.0 |
| 63 |
+ fi |
| 64 |
sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml |
| 65 |
default |
| 66 |
} |
| 67 |
@@ -58,12 +51,14 @@ bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" |
| 68 |
lib_progs="gprlib gprbind" |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
+ GCC=${CHOST}-gcc-${GCC_PV} |
| 72 |
if use bootstrap; then |
| 73 |
+ GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
| 74 |
local xmlada_src="../xmlada-gpl-${PV}-src" |
| 75 |
incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \ |
| 76 |
-I${xmlada_src}/schema -I${xmlada_src}/unicode \ |
| 77 |
-I${xmlada_src}/input_sources" |
| 78 |
- $(tc-getCC) -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o |
| 79 |
+ ${GCC} -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o || die |
| 80 |
for bin in ${bin_progs}; do |
| 81 |
${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ |
| 82 |
-o ${bin} -largs gpr_imports.o || die |
| 83 |
@@ -88,7 +83,7 @@ src_install() { |
| 84 |
exeinto /usr/libexec/gprbuild |
| 85 |
doexe ${lib_progs} |
| 86 |
insinto /usr/share/gprconfig |
| 87 |
- doins share/gprconfig/*.xml |
| 88 |
+ doins share/gprconfig/* |
| 89 |
insinto /usr/share/gpr |
| 90 |
doins share/_default.gpr |
| 91 |
else |
| 92 |
@@ -98,9 +93,6 @@ src_install() { |
| 93 |
emake DESTDIR="${D}" libgpr.install.${kind} |
| 94 |
fi |
| 95 |
done |
| 96 |
- mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die |
| 97 |
- mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die |
| 98 |
- rmdir "${D}"/usr/share/doc/${PN} || die |
| 99 |
fi |
| 100 |
insinto /usr/share/gprconfig |
| 101 |
doins gnat-${GCC_PV}.xml |
| 102 |
|
| 103 |
diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild |
| 104 |
index 60fa7d00f00..a6101175e17 100644 |
| 105 |
--- a/dev-ada/gprbuild/gprbuild-2017.ebuild |
| 106 |
+++ b/dev-ada/gprbuild/gprbuild-2017.ebuild |
| 107 |
@@ -20,10 +20,9 @@ SLOT="0" |
| 108 |
KEYWORDS="~amd64" |
| 109 |
IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" |
| 110 |
|
| 111 |
-DEPEND=" |
| 112 |
- !bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) |
| 113 |
- gnat_2016? ( =dev-lang/gnat-gpl-2016 ) |
| 114 |
- gnat_2017? ( =dev-lang/gnat-gpl-2017 )" |
| 115 |
+DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) |
| 116 |
+ gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
| 117 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" |
| 118 |
RDEPEND="${DEPEND}" |
| 119 |
|
| 120 |
S="${WORKDIR}"/${MYP}-src |
Archives