Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
Date: Thu, 03 May 2018 06:31:22
Message-Id: 1525329068.92c6a25e4985c815faf78d8fc1d15b4f4d7f930c.tupone@gentoo
1 commit: 92c6a25e4985c815faf78d8fc1d15b4f4d7f930c
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 3 06:29:50 2018 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Thu May 3 06:31:08 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c6a25e
7
8 dev-ada/langkit: Fix test when libgpr and xmlada are build with static-libs
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-ada/langkit/files/langkit-2017-gentoo.patch | 33 +++++++++++++++++++++++++
13 1 file changed, 33 insertions(+)
14
15 diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch
16 index e6609236b6c..ecb7ce6e74d 100644
17 --- a/dev-ada/langkit/files/langkit-2017-gentoo.patch
18 +++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch
19 @@ -45,3 +45,36 @@
20
21 package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps
22 (Lexical_Env, Integer, Hash, "=");
23 +--- a/testsuite/testsuite_support/__init__.py.old 2018-05-02 21:40:04.977442020 +0200
24 ++++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200
25 +@@ -68,6 +68,7 @@
26 + # to build it in parallel.
27 + if not self.global_env['options'].disable_tear_up_builds:
28 +- p = Run(['gprbuild', '-p', '-f', '-P',
29 ++ p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable',
30 ++ '-XXMLADA_BUILD=relocatable', '-P',
31 + os.path.join(self.root_dir, '..', 'langkit', 'support',
32 + 'langkit_support.gpr')], output=PIPE)
33 + report(p, "Langkit support")
34 +--- a/testsuite/testsuite_support/langkit_support_driver.py.old 2018-05-03 08:01:20.019944992 +0200
35 ++++ b/testsuite/testsuite_support/langkit_support_driver.py 2018-05-03 08:02:50.146430288 +0200
36 +@@ -36,5 +36,7 @@
37 + ))
38 +
39 + self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata',
40 ++ '-XLIBRARY_TYPE=relocatable',
41 ++ '-XXMLADA_BUILD=relocatable',
42 + '-cargs', '-O0', '-g'])
43 + self.run_and_check(['./{}'.format(source[:-4])])
44 ++++ a/testsuite/testsuite_support/adalog_driver.py.old 2018-05-03 08:14:30.998698722 +0200
45 +--- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200
46 +@@ -41,6 +41,8 @@
47 + )
48 + ))
49 +
50 +- self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0',
51 ++ self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable',
52 ++ '-XXMLADA_BUILD=relocatable',
53 ++ '-P', 'p.gpr', '-cargs', '-O0',
54 + '-g'])
55 + self.run_and_check(['./{}'.format(source[:-4])])