[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/

["Alfredo Tupone" <tupone@gentoo.org>]

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)