1 |
commit: aff3399c534657a3d399e7ff82ea5af845569908 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 26 20:05:52 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 26 20:05:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff3399c |
7 |
|
8 |
dev-ada/gps: respect ADAFLAGS/CFLAGS |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
dev-ada/gps/files/gps-2018-gentoo.patch | 56 +++++++++++++++++++++++++-------- |
13 |
dev-ada/gps/gps-2018.ebuild | 6 ++-- |
14 |
2 files changed, 46 insertions(+), 16 deletions(-) |
15 |
|
16 |
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch |
17 |
index d03a0111122..06a080b69d5 100644 |
18 |
--- a/dev-ada/gps/files/gps-2018-gentoo.patch |
19 |
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch |
20 |
@@ -1,25 +1,15 @@ |
21 |
--- a/gps/Makefile 2018-07-09 20:27:34.950424490 +0200 |
22 |
+++ b/gps/Makefile 2018-07-09 20:37:39.510558817 +0200 |
23 |
-@@ -47,7 +47,7 @@ |
24 |
+@@ -47,7 +47,8 @@ |
25 |
for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done |
26 |
endif |
27 |
$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \ |
28 |
- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` |
29 |
-+ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 |
30 |
++ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 \ |
31 |
++ -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} |
32 |
|
33 |
resources: |
34 |
ifeq ($(OS),Windows_NT) |
35 |
---- a/testsuite/Makefile 2018-07-09 21:45:48.115937491 +0200 |
36 |
-+++ b/testsuite/Makefile 2018-07-09 21:46:15.896547268 +0200 |
37 |
-@@ -13,7 +13,7 @@ |
38 |
- endif |
39 |
- |
40 |
- all default: package |
41 |
-- $(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable |
42 |
-+ $(GPRBUILD) -P testsuite_drivers.gpr -m -XOS=${OS} -j0 -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable -largs -lpython2.7 |
43 |
- |
44 |
- package: |
45 |
- mkdir -p share/doc |
46 |
--- a/Makefile.in 2018-07-09 21:51:08.422550386 +0200 |
47 |
+++ b/Makefile.in 2018-07-09 21:51:32.187225891 +0200 |
48 |
@@ -10,7 +10,7 @@ |
49 |
@@ -85,3 +75,43 @@ |
50 |
<string /> |
51 |
</project_attribute> |
52 |
|
53 |
+--- a/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:42:17.618161040 +0200 |
54 |
++++ b/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:43:33.973070921 +0200 |
55 |
+@@ -14,6 +14,7 @@ |
56 |
+ for Switches ("C") use |
57 |
+ ("-g", "-O2") |
58 |
+ & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags; |
59 |
++ for Driver ("C") use External ("CC", "gcc"); |
60 |
+ end Compiler; |
61 |
+ |
62 |
+ end GNATCOLL_Extras; |
63 |
+--- a/widgets/widgets.gpr 2018-07-22 21:46:23.907355738 +0200 |
64 |
++++ b/widgets/widgets.gpr 2018-07-22 21:47:02.673825994 +0200 |
65 |
+@@ -14,6 +14,7 @@ |
66 |
+ for Switches ("C") use |
67 |
+ ("-g", "-O2") |
68 |
+ & Shared.Gtk_Cflags; |
69 |
++ for Driver ("C") use External ("CC", "gcc"); |
70 |
+ end Compiler; |
71 |
+ |
72 |
+ end Widgets; |
73 |
+--- a/common/common.gpr.in 2018-07-25 08:05:45.227060250 +0200 |
74 |
++++ b/common/common.gpr.in 2018-07-25 08:06:55.067009811 +0200 |
75 |
+@@ -23,6 +23,7 @@ |
76 |
+ for Switches ("dynamic_arrays.adb") use No_Checks; |
77 |
+ when "Debug" => |
78 |
+ end case; |
79 |
++ for Driver ("C") use External ("CC", "gcc"); |
80 |
+ end Compiler; |
81 |
+ |
82 |
+ package Binder is |
83 |
+--- a/shared.gpr.in 2018-07-25 08:11:47.317597391 +0200 |
84 |
++++ b/shared.gpr.in 2018-07-25 08:10:56.774362671 +0200 |
85 |
+@@ -60,6 +60,7 @@ |
86 |
+ ); |
87 |
+ for Switches ("C") use Optimize & ("-g", "-O2"); |
88 |
+ end case; |
89 |
++ for Driver ("C") use External ("CC", "gcc"); |
90 |
+ end Compiler; |
91 |
+ |
92 |
+ package Binder is |
93 |
|
94 |
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild |
95 |
index e67c569534f..5a97ccc8bd2 100644 |
96 |
--- a/dev-ada/gps/gps-2018.ebuild |
97 |
+++ b/dev-ada/gps/gps-2018.ebuild |
98 |
@@ -66,10 +66,10 @@ src_configure() { |
99 |
} |
100 |
|
101 |
src_compile() { |
102 |
- emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \ |
103 |
+ CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \ |
104 |
Build=Production |
105 |
- gprbuild -v -p -Pcli/cli.gpr -XLIBRARY_TYPE=relocatable |
106 |
- emake -C testsuite |
107 |
+ gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \ |
108 |
+ -cargs:Ada ${ADAFLAGS} |
109 |
} |
110 |
|
111 |
src_install() { |