| 1 |
commit: c22f22a3b400873197ce60111e3aaf63cdba4b53 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 10 20:44:43 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 20:44:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22f22a3 |
| 7 |
|
| 8 |
dev-ada/gps: Respect CFLAGS and ADAFLAGS |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-ada/gps/files/gps-2017-gentoo.patch | 59 ++++++++++++++++++++++++++++----- |
| 13 |
dev-ada/gps/gps-2017.ebuild | 6 ++-- |
| 14 |
2 files changed, 54 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch |
| 17 |
index e6ff1453189..631e6dc92ef 100644 |
| 18 |
--- a/dev-ada/gps/files/gps-2017-gentoo.patch |
| 19 |
+++ b/dev-ada/gps/files/gps-2017-gentoo.patch |
| 20 |
@@ -244,7 +244,7 @@ |
| 21 |
---------------------------- |
| 22 |
--- gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb.old 2017-11-23 22:02:52.819994229 +0100 |
| 23 |
+++ gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:07:20.326248295 +0100 |
| 24 |
-@@ -309,12 +309,12 @@ |
| 25 |
+@@ -309,12 +309,13 @@ |
| 26 |
else |
| 27 |
Set_Command |
| 28 |
(Tc, GNAT_Driver, |
| 29 |
@@ -255,7 +255,8 @@ |
| 30 |
Set_Command |
| 31 |
(Tc, GNAT_List, |
| 32 |
- To_String (Full_Path) & "gnatls", |
| 33 |
-+ To_String (Full_Path) & "@GNATLS@", |
| 34 |
++ To_String (Full_Path) & |
| 35 |
++ "@GNATLS@", |
| 36 |
From_Default, |
| 37 |
Is_Default_Path); |
| 38 |
Set_Command |
| 39 |
@@ -278,10 +279,10 @@ |
| 40 |
|
| 41 |
- Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True); |
| 42 |
- Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True); |
| 43 |
-+ Set_Command (Native_Toolchain, GNAT_Driver, "@GNAT@", From_Default, |
| 44 |
-+ True); |
| 45 |
-+ Set_Command (Native_Toolchain, GNAT_List, "@GNATLS@", From_Default, |
| 46 |
-+ True); |
| 47 |
++ Set_Command (Native_Toolchain, GNAT_Driver, |
| 48 |
++ "@GNAT@", From_Default, True); |
| 49 |
++ Set_Command (Native_Toolchain, GNAT_List, |
| 50 |
++ "@GNATLS@", From_Default, True); |
| 51 |
Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True); |
| 52 |
Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True); |
| 53 |
|
| 54 |
@@ -289,8 +290,50 @@ |
| 55 |
|
| 56 |
if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then |
| 57 |
- Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default); |
| 58 |
-+ Add_Compiler (Native_Toolchain, "Ada", "@GNATMAKE@", |
| 59 |
-+ From_Default); |
| 60 |
++ Add_Compiler (Native_Toolchain, "Ada", |
| 61 |
++ "@GNATMAKE@", From_Default); |
| 62 |
end if; |
| 63 |
|
| 64 |
if Get_Compiler (Native_Toolchain, "C") = No_Compiler then |
| 65 |
+--- gps-gpl-2017-src/gps/Makefile.old 2017-12-10 20:29:18.267622400 +0100 |
| 66 |
++++ gps-gpl-2017-src/gps/Makefile 2017-12-10 20:29:34.564312700 +0100 |
| 67 |
+@@ -45,7 +45,8 @@ |
| 68 |
+ for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done |
| 69 |
+ endif |
| 70 |
+ $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \ |
| 71 |
+- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` |
| 72 |
++ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \ |
| 73 |
++ -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS} |
| 74 |
+ |
| 75 |
+ resources: |
| 76 |
+ ifeq ($(OS),Windows_NT) |
| 77 |
+--- gps-gpl-2017-src/common/common_no_xmlada.gpr.in.old 2017-12-10 20:48:13.986166250 +0100 |
| 78 |
++++ gps-gpl-2017-src/common/common_no_xmlada.gpr.in 2017-12-10 20:48:29.654872055 +0100 |
| 79 |
+@@ -22,6 +22,7 @@ |
| 80 |
+ for Switches ("dynamic_arrays.adb") use No_Checks; |
| 81 |
+ when "Debug" => |
| 82 |
+ end case; |
| 83 |
++ for Driver ("C") use External ("CC", "gcc"); |
| 84 |
+ end Compiler; |
| 85 |
+ |
| 86 |
+ package Naming is |
| 87 |
+--- gps-gpl-2017-src/common/common_with_xmlada.gpr.in.old 2017-12-10 20:48:37.352727540 +0100 |
| 88 |
++++ gps-gpl-2017-src/common/common_with_xmlada.gpr.in 2017-12-10 20:48:50.423482155 +0100 |
| 89 |
+@@ -23,6 +23,7 @@ |
| 90 |
+ for Switches ("dynamic_arrays.adb") use No_Checks; |
| 91 |
+ when "Debug" => |
| 92 |
+ end case; |
| 93 |
++ for Driver ("C") use External ("CC", "gcc"); |
| 94 |
+ end Compiler; |
| 95 |
+ |
| 96 |
+ package Binder is |
| 97 |
+--- gps-gpl-2017-src/shared.gpr.in.old 2017-12-10 20:52:51.117967249 +0100 |
| 98 |
++++ gps-gpl-2017-src/shared.gpr.in 2017-12-10 20:53:15.627507886 +0100 |
| 99 |
+@@ -56,6 +56,7 @@ |
| 100 |
+ ); |
| 101 |
+ for Switches ("C") use Optimize & ("-g", "-O2"); |
| 102 |
+ end case; |
| 103 |
++ for Driver ("C") use External ("CC", "gcc"); |
| 104 |
+ end Compiler; |
| 105 |
+ |
| 106 |
+ package Binder is |
| 107 |
|
| 108 |
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild |
| 109 |
index 1425084ddd9..7ab72b50e19 100644 |
| 110 |
--- a/dev-ada/gps/gps-2017.ebuild |
| 111 |
+++ b/dev-ada/gps/gps-2017.ebuild |
| 112 |
@@ -45,9 +45,9 @@ src_prepare() { |
| 113 |
GCC_PV=6.3.0 |
| 114 |
mv configure.{in,ac} || die |
| 115 |
sed -i \ |
| 116 |
- -e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \ |
| 117 |
- -e "s:@GNAT@:gnat-${GCC_PV}:g" \ |
| 118 |
- -e "s:@GNATLS@:gnatls-${GCC_PV}:g" \ |
| 119 |
+ -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \ |
| 120 |
+ -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \ |
| 121 |
+ -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ |
| 122 |
aclocal.m4 \ |
| 123 |
share/support/core/gnat_help_menus.py \ |
| 124 |
share/support/core/toolchains.py \ |
Archives