Skip to content

Commit

Permalink
dev-ada/langkit: remove hack for gcc
Browse files Browse the repository at this point in the history
Signed-off-by: Alfredo Tupone <[email protected]>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
  • Loading branch information
atupone committed Nov 11, 2018
1 parent 5990bdd commit 2ef1f0e
Showing 1 changed file with 7 additions and 31 deletions.
38 changes: 7 additions & 31 deletions dev-ada/langkit/files/langkit-2017-gentoo.patch
Original file line number Diff line number Diff line change
@@ -1,29 +1,5 @@
--- langkit-gps-src/langkit/templates/project_file.mako.old 2017-07-11 14:19:12.841221846 +0200
+++ langkit-gps-src/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200
@@ -82,9 +82,11 @@
for Default_Switches ("Ada") use
Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata");

- for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0");
+ for Default_Switches ("C") use Common_C_Cargs &
+ ("-g3", "-O0", "-fPIC");

- for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0");
+ for Switches ("quex_lexer.c") use Common_C_Cargs &
+ ("-g0", "-O0", "-fPIC");
-- This file is *huge* and the debugging information for it harms
-- Valgrind runs. We almost never have to debug this file so
-- this is acceptable.
@@ -111,6 +111,7 @@
-- ... and this prevents OOM on other platforms
end case;
end case;
+ for Driver ("C") use External ("GCC", "gcc");
end Compiler;

package Binder is
--- langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100
+++ langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100
--- a/langkit/compile_context.py 2017-12-13 22:12:38.689143125 +0100
+++ b/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100
@@ -1171,8 +1171,7 @@
# the Quex specification changed from last build.
if generate_lexer and self.cache.is_stale('quex_specification',
Expand All @@ -34,8 +10,8 @@
quex_file,
"-o", "quex_lexer",
"--buffer-element-size", "4",
--- langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako.old 2017-12-26 20:47:28.461617512 +0100
+++ langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100
--- a/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:28.461617512 +0100
+++ b/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100
@@ -2196,7 +2196,7 @@
-- printing them.

Expand All @@ -45,7 +21,7 @@

package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
(Lexical_Env, Integer, Hash, "=");
--- a/testsuite/testsuite_support/__init__.py.old 2018-05-02 21:40:04.977442020 +0200
--- a/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:04.977442020 +0200
+++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200
@@ -68,6 +68,7 @@
# to build it in parallel.
Expand All @@ -56,7 +32,7 @@
os.path.join(self.root_dir, '..', 'langkit', 'support',
'langkit_support.gpr')], output=PIPE)
report(p, "Langkit support")
--- a/testsuite/testsuite_support/langkit_support_driver.py.old 2018-05-03 08:01:20.019944992 +0200
--- a/testsuite/testsuite_support/langkit_support_driver.py 2018-05-03 08:01:20.019944992 +0200
+++ b/testsuite/testsuite_support/langkit_support_driver.py 2018-05-03 08:02:50.146430288 +0200
@@ -36,5 +36,7 @@
))
Expand All @@ -66,7 +42,7 @@
+ '-XXMLADA_BUILD=relocatable',
'-cargs', '-O0', '-g'])
self.run_and_check(['./{}'.format(source[:-4])])
+++ a/testsuite/testsuite_support/adalog_driver.py.old 2018-05-03 08:14:30.998698722 +0200
+++ a/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:14:30.998698722 +0200
--- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200
@@ -41,6 +41,8 @@
)
Expand Down

0 comments on commit 2ef1f0e

Please sign in to comment.