commit: 37f9c1c5f169989dd16b2a640ad30b7c79e9fac4
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 13:37:59 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 13:37:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f9c1c5
dev-ada/asis: Fix build with gpr (relocatable)
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/asis/asis-2016.ebuild | 5 +++--
dev-ada/asis/files/asis-2016-gentoo.patch | 13 +++++++------
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dev-ada/asis/asis-2016.ebuild b/dev-ada/asis/asis-2016.ebuild
index c83e81adbdf..1655a468d62 100644
--- a/dev-ada/asis/asis-2016.ebuild
+++ b/dev-ada/asis/asis-2016.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,7 +30,8 @@ S="${WORKDIR}"/${MYP}
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
- emake PROCESSORS=$(makeopts_jobs)
+ emake PROCESSORS=$(makeopts_jobs) \
+ GPRBUILD_FLAGS="-vl"
emake tools PROCESSORS=$(makeopts_jobs) \
GPRBUILD_FLAGS="-vl \
-XLIBRARY_TYPE=relocatable \
diff --git a/dev-ada/asis/files/asis-2016-gentoo.patch
b/dev-ada/asis/files/asis-2016-gentoo.patch
index c5ffda3628b..11a83e0fda9 100644
--- a/dev-ada/asis/files/asis-2016-gentoo.patch
+++ b/dev-ada/asis/files/asis-2016-gentoo.patch
@@ -1,6 +1,6 @@
---- asis-gpl-2015-src/Makefile.old 2017-01-03 13:59:38.106788092 +0000
-+++ asis-gpl-2015-src/Makefile 2017-01-03 14:01:43.735605615 +0000
-@@ -10,15 +10,18 @@
+--- a/Makefile 2017-01-03 13:59:38.106788092 +0000
++++ b/Makefile 2017-01-03 14:01:43.735605615 +0000
+@@ -10,15 +10,19 @@
# ==================================================== build
all:
@@ -19,13 +19,14 @@
setup:
- $(GPRBUILD) -p -XBLD=$(BLD) tools/tool_utils/generate_factory.gpr
-+ $(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD)
tools/tool_utils/generate_factory.gpr \
++ $(GPRBUILD) -p -j$(PROCESSORS) -XBLD=$(BLD) \
++ $(GPRBUILD_FLAGS) tools/tool_utils/generate_factory.gpr \
+ -cargs $(ADAFLAGS)
rm -rf tools/tool_utils/ada_trees-factory.ads
tools/tool_utils/ada_trees-factory.adb
rm -rf tools/gnat2xml/ada_trees-factory.ads
tools/gnat2xml/ada_trees-factory.adb
cd tools/tool_utils ; ./ada_trees-generate_factory$(exe_ext)
---- asis-gpl-2016-src/Makefile.stub.old 2017-04-06 21:16:41.802376709
+0200
-+++ asis-gpl-2016-src/Makefile.stub 2017-04-06 21:17:01.627023825 +0200
+--- a/Makefile.stub 2017-04-06 21:16:41.802376709 +0200
++++ b/Makefile.stub 2017-04-06 21:17:01.627023825 +0200
@@ -3,7 +3,6 @@
# Where Asis library should be installed
