* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
@ 2018-11-14 21:42 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2018-11-14 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 09396b5f7b62226bce1a0d36dfa14a796c8fd759
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 14 21:41:54 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 21:41:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09396b5f
dev-ada/langkit: Fx build with new libgpr
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/langkit/files/langkit-2017-gentoo.patch | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
index bc744d8ded5..7b6501ed8a7 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -23,34 +23,47 @@
(Lexical_Env, Integer, Hash, "=");
--- 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 @@
+@@ -68,6 +68,8 @@
# to build it in parallel.
if not self.global_env['options'].disable_tear_up_builds:
- p = Run(['gprbuild', '-p', '-f', '-P',
+ p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable',
++ '-XGPR_BUILD=relocatable',
+ '-XXMLADA_BUILD=relocatable', '-P',
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 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 @@
+@@ -36,5 +36,8 @@
))
self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata',
+ '-XLIBRARY_TYPE=relocatable',
++ '-XGPR_BUILD=relocatable',
+ '-XXMLADA_BUILD=relocatable',
'-cargs', '-O0', '-g'])
self.run_and_check(['./{}'.format(source[:-4])])
+++ 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 @@
+@@ -41,6 +41,9 @@
)
))
- self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0',
+ self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable',
++ '-XGPR_BUILD=relocatable',
+ '-XXMLADA_BUILD=relocatable',
+ '-P', 'p.gpr', '-cargs', '-O0',
'-g'])
self.run_and_check(['./{}'.format(source[:-4])])
+--- a/langkit/libmanage.py 2018-11-14 22:02:20.283672719 +0100
++++ b/langkit/libmanage.py 2018-11-14 22:02:39.970337338 +0100
+@@ -634,6 +634,7 @@
+
+ result = ['-XBUILD_MODE={}'.format(build_mode),
+ '-XLIBRARY_TYPE={}'.format(library_type),
++ '-XGPR_BUILD={}'.format(library_type),
+ '-XXMLADA_BUILD={}'.format(library_type)]
+
+ enable_warnings = getattr(args, 'enable_warnings', False)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
@ 2022-01-19 20:32 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2022-01-19 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 854110b65b471a0ad2a7b2b9813f9f806d521297
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 22 07:06:57 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 19 20:31:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854110b6
dev-ada/langkit: remove unused patch(es)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23467
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/langkit/files/langkit-22.0.0-gnarl.patch | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch
deleted file mode 100644
index fb69768dc9de..000000000000
--- a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/langkit/templates/mains_project_file.mako 2020-06-09 09:34:36.677265457 +0200
-+++ b/langkit/templates/mains_project_file.mako 2020-06-09 09:35:30.569451995 +0200
-@@ -40,4 +40,7 @@
- for Switches ("ada") use ("-E");
- end Binder;
-
-+ package Linker is
-+ for Switches ("ada") use ("-lgnat", "-lgnarl");
-+ end Linker;
- end Mains;
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
@ 2018-11-11 20:27 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2018-11-11 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 2ef1f0e5e5bd0724077a50e400c8496bb24cfb23
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 20:26:54 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Nov 11 20:26:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef1f0e5
dev-ada/langkit: remove hack for gcc
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/langkit/files/langkit-2017-gentoo.patch | 38 +++++--------------------
1 file changed, 7 insertions(+), 31 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
index ecb7ce6e74d..bc744d8ded5 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -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',
@@ -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.
@@ -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.
@@ -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 @@
))
@@ -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 @@
)
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
@ 2018-10-14 18:54 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2018-10-14 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 0578333a540ea97c58f893d04d70c84846676125
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 18:54:08 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 18:54:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0578333a
dev-ada/langkit: Remove c driver from template
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-ada/langkit/files/langkit-2018-gentoo.patch | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch
index aacca6092c1..52920e906ee 100644
--- a/dev-ada/langkit/files/langkit-2018-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch
@@ -1,13 +1,3 @@
---- a/langkit/templates/project_file.mako 2017-07-11 14:19:12.841221846 +0200
-+++ b/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200
-@@ -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
--- a/langkit/compile_context.py 2018-07-04 19:17:08.329346507 +0200
+++ b/langkit/compile_context.py 2018-07-04 19:17:57.276615724 +0200
@@ -1684,7 +1684,7 @@
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
@ 2018-05-03 6:31 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2018-05-03 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 92c6a25e4985c815faf78d8fc1d15b4f4d7f930c
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 06:29:50 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 3 06:31:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c6a25e
dev-ada/langkit: Fix test when libgpr and xmlada are build with static-libs
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-ada/langkit/files/langkit-2017-gentoo.patch | 33 +++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
index e6609236b6c..ecb7ce6e74d 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -45,3 +45,36 @@
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
++++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200
+@@ -68,6 +68,7 @@
+ # to build it in parallel.
+ if not self.global_env['options'].disable_tear_up_builds:
+- p = Run(['gprbuild', '-p', '-f', '-P',
++ p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable',
++ '-XXMLADA_BUILD=relocatable', '-P',
+ 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
++++ b/testsuite/testsuite_support/langkit_support_driver.py 2018-05-03 08:02:50.146430288 +0200
+@@ -36,5 +36,7 @@
+ ))
+
+ self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata',
++ '-XLIBRARY_TYPE=relocatable',
++ '-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
+--- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200
+@@ -41,6 +41,8 @@
+ )
+ ))
+
+- self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0',
++ self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable',
++ '-XXMLADA_BUILD=relocatable',
++ '-P', 'p.gpr', '-cargs', '-O0',
+ '-g'])
+ self.run_and_check(['./{}'.format(source[:-4])])
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
@ 2017-12-26 19:55 Alfredo Tupone
0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2017-12-26 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 536f37f77364a2a932f60e80780342b838c049be
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 19:54:50 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 19:54:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536f37f7
dev-ada/langkit: Fix constraint error on hash
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-ada/langkit/files/langkit-2017-gentoo.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
index 0260d44c888..e6609236b6c 100644
--- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
+++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
@@ -34,3 +34,14 @@
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
+@@ -2196,7 +2196,7 @@
+ -- printing them.
+
+ function Hash (S : Lexical_Env) return Hash_Type is
+- (Hash_Type (To_Integer (S.all'Address)));
++ (Hash_Type'Mod (To_Integer (S.all'Address)));
+
+ package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
+ (Lexical_Env, Integer, Hash, "=");
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-19 20:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-14 21:42 [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2022-01-19 20:32 Alfredo Tupone
2018-11-11 20:27 Alfredo Tupone
2018-10-14 18:54 Alfredo Tupone
2018-05-03 6:31 Alfredo Tupone
2017-12-26 19:55 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox