1 |
commit: f852753f1afc2d3286bfa4699e3493c99a384f5f |
2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 14 18:30:40 2021 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 14 18:32:56 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f852753f |
7 |
|
8 |
dev-ada/gprbuild: fix VariableScope for 2020 version |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
12 |
|
13 |
dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 10 +++------- |
14 |
dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 4 ---- |
15 |
dev-ada/gprbuild/gprbuild-2020.ebuild | 6 +----- |
16 |
3 files changed, 4 insertions(+), 16 deletions(-) |
17 |
|
18 |
diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild |
19 |
index 8e9afef371c..4b54ddf9978 100644 |
20 |
--- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild |
21 |
+++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2019 Gentoo Authors |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=7 |
28 |
@@ -54,10 +54,6 @@ src_prepare() { |
29 |
fi |
30 |
} |
31 |
|
32 |
-src_configure() { |
33 |
- emake prefix="${D}"/usr setup |
34 |
-} |
35 |
- |
36 |
bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" |
37 |
lib_progs="gprlib gprbind" |
38 |
|
39 |
@@ -69,11 +65,11 @@ src_compile() { |
40 |
gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die |
41 |
for bin in ${bin_progs}; do |
42 |
gnatmake -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ |
43 |
- -o ${bin} -largs gpr_imports.o || die |
44 |
+ -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die |
45 |
done |
46 |
for lib in $lib_progs; do |
47 |
gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ |
48 |
- -largs gpr_imports.o || die |
49 |
+ -largs ${LDFLAGS} gpr_imports.o || die |
50 |
done |
51 |
} |
52 |
|
53 |
|
54 |
diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild |
55 |
index d95789381b9..d3ee4019b22 100644 |
56 |
--- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild |
57 |
+++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild |
58 |
@@ -45,10 +45,6 @@ src_prepare() { |
59 |
|| die |
60 |
} |
61 |
|
62 |
-src_configure() { |
63 |
- emake prefix="${D}"/usr setup |
64 |
-} |
65 |
- |
66 |
bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" |
67 |
lib_progs="gprlib gprbind" |
68 |
|
69 |
|
70 |
diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild |
71 |
index 9d14bd49683..dd6ac51b2fa 100644 |
72 |
--- a/dev-ada/gprbuild/gprbuild-2020.ebuild |
73 |
+++ b/dev-ada/gprbuild/gprbuild-2020.ebuild |
74 |
@@ -1,4 +1,4 @@ |
75 |
-# Copyright 1999-2020 Gentoo Authors |
76 |
+# Copyright 1999-2021 Gentoo Authors |
77 |
# Distributed under the terms of the GNU General Public License v2 |
78 |
|
79 |
EAPI=7 |
80 |
@@ -45,10 +45,6 @@ src_prepare() { |
81 |
|| die |
82 |
} |
83 |
|
84 |
-src_configure() { |
85 |
- emake prefix="${D}"/usr setup |
86 |
-} |
87 |
- |
88 |
bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" |
89 |
lib_progs="gprlib gprbind" |