diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-ada/langkit | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-ada/langkit')
-rw-r--r-- | dev-ada/langkit/Manifest | 4 | ||||
-rw-r--r-- | dev-ada/langkit/files/langkit-2018-gentoo.patch | 49 | ||||
-rw-r--r-- | dev-ada/langkit/langkit-2018.ebuild | 9 |
3 files changed, 54 insertions, 8 deletions
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index c22bad97ac71..fa838fd0e45f 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1,7 +1,7 @@ AUX langkit-2017-gentoo.patch 3616 BLAKE2B 3730635b5cb4a2285e3ef283c903705b8f40194bdb65049ca07f651ea9d122e72e863cf132e096f139b9dc6f57a1d7faf7f333a3580e641caa88d4fea4b22009 SHA512 b69c84f3d79adefb254f764ba06c6d5fda81f95a8070b4b651d7a4f2ad078a48e341e5ad94e5ce7e2f756961d943dde3de891c5825c0e367cf7f816e08a31791 -AUX langkit-2018-gentoo.patch 569 BLAKE2B ea4df3a3651da82c7c61d251a2b330ef735d677f1303113160f7bfcf3c0760d7606d4ac7fdd3484efb3bf2fe23deb8d245a68a6425e2b8c36c2fdf0246ad0b38 SHA512 7a115b3f4307a01b7024571ad878b5c459cddf5c3e79747b9e5d7a64a15ffde75f6eef8225721b5f42821248df03d190030d24ae7f82492c8ff415eb76ca1113 +AUX langkit-2018-gentoo.patch 2962 BLAKE2B 7da72c1739c972c6d1aa01c84e8fab3f8864c5449bb3717c8515c41f63eb1a2258ae9be0cfd5bb3bf54327fbe552c2448aa2fb80d69814c1d46f34611683d7db SHA512 72c6ba5e4994ef22f6246a196fdae81ee5f77f7f0420fd31b9bfecb32740b8878863ba75d342cb0c5326ca7031260aefc21f57d430866f7008515470d9ee0899 DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 EBUILD langkit-2017.ebuild 911 BLAKE2B f75a3fdec74b278be740b37993909e2627a7f4084d6967c2c9a5a7f41cfa2bfd777e45f5d6143fe88b2ba15ead72d47766d94c59d3283f6c18ab98c7959c409d SHA512 2f2c5939fdb316b63f740e230e442ad33e3ab2bee21b08d3a3688391bc8a40c17a3f9fa578062fe0cd58ea4747c27b8a4ed2689dc1a153043a5bf2d9d04fc1fd -EBUILD langkit-2018.ebuild 985 BLAKE2B 2b4bc94e8e20f93ba4b98e345bcf07b717d3f07075a447bb69d6ae586cff4a1ed7d0dfd2f61aa6636cc6212aa335f17a7ed8301b52d98e6fe133219292225a73 SHA512 e499e41572d61a668707710824865ba431d8e6ef576668c8d31895334014996fd98adde25baa7d0017087102b1eadd8c0b768aab18ace9fa5192838635d4c3e6 +EBUILD langkit-2018.ebuild 917 BLAKE2B a7d50141e6a26768aa62a590670624ca43114c0d66472f5e797a023c40efe03e2e747d10b49cf4cad394e78ea9c41a0cf4b2df980578900d4d6ac8f145499121 SHA512 7cc768a8e9829af8711e0adbcedadd2e1d6e02a6fa21d6f7b2a2a6e7e261e1af2cd5c849b6e8b81272ec615dd3e83ab20b754fc9662dcfa7e14cfe607f5e9151 MISC metadata.xml 748 BLAKE2B 29a7b386b6d8d1b2f2bc8fc16739c28129b7886c8cdae6784d54bfaadea87502a5338ed6113f536e7c5701cefb42d5912f6189dccb55ddd704445ae65f5c4176 SHA512 8a3183336e00f01eeb51a5b7d06833599b408801b71713575d83131d39b82c8c74fda8ce133b352dc356135721ef19ca488ef17723172579cd1507d4c1d7c809 diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch index 52920e906eee..62ff7ce17e54 100644 --- a/dev-ada/langkit/files/langkit-2018-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch @@ -9,3 +9,52 @@ quex_file, "-o", "quex_lexer", "--buffer-element-size", "4", +--- a/langkit/libmanage.py 2018-11-20 21:38:03.042086783 +0100 ++++ b/langkit/libmanage.py 2018-11-20 21:39:50.562273656 +0100 +@@ -682,6 +682,8 @@ + + result = ['-XBUILD_MODE={}'.format(build_mode), + '-XLIBRARY_TYPE={}'.format(library_type), ++ '-XGPR_BUILD={}'.format(library_type), ++ '-XGNATCOLL_CORE_BUILD={}'.format(library_type), + '-XXMLADA_BUILD={}'.format(library_type)] + + enable_build_warnings = getattr(args, 'enable_build_warnings', False) +--- a/testsuite/python_support/utils.py 2018-11-20 21:41:46.156324084 +0100 ++++ b/testsuite/python_support/utils.py 2018-11-20 21:42:26.049651194 +0100 +@@ -203,7 +203,8 @@ + main_sources=', '.join('"{}"'.format(m) for m in ada_main) + )) + run('gprbuild', '-Pgen', '-q', '-p', +- '-XLIBRARY_TYPE=relocatable', '-XXMLADA_BUILD=relocatable') ++ '-XLIBRARY_TYPE=relocatable', '-XGPR_BUILD=relocatable', ++ '-XXMLADA_BUILD=relocatable') + + for i, m in enumerate(ada_main): + assert m.endswith('.adb') +--- a/testsuite/testsuite_support/__init__.py 2018-11-20 21:45:08.828905205 +0100 ++++ b/testsuite/testsuite_support/__init__.py 2018-11-20 21:46:10.837858988 +0100 +@@ -110,7 +110,9 @@ + # Build Langkit_Support so that each testcase does not try to build it + # in parallel. + if not self.global_env['options'].disable_tear_up_builds: +- gargs = ['-p', '-P', self.langkit_support_project_file] ++ gargs = ['-p'] ++ gargs = gargs + ['-XGPR_BUILD=relocatable'] ++ gargs = gargs + ['-P', self.langkit_support_project_file] + cargs = ['-cargs', '-O0', '-g'] + if self.coverage_enabled: + gargs.append('--subdirs=gnatcov') +--- a/testsuite/testsuite_support/base_driver.py 2018-11-20 22:04:54.199973719 +0100 ++++ b/testsuite/testsuite_support/base_driver.py 2018-11-20 22:05:26.498436100 +0100 +@@ -312,7 +312,9 @@ + + :param str project_file: Project file name. + """ +- argv = ['gprbuild', '-P', project_file, '-p'] ++ argv = ['gprbuild'] ++ argv = argv + ['-XGPR_BUILD=relocatable'] ++ argv = argv + ['-P', project_file, '-p'] + cargs = ['-O0', '-g', '-gnata'] + if self.coverage_enabled: + argv.append('--subdirs=gnatcov') diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild index 9bb818cf2e8b..3eeaca02add9 100644 --- a/dev-ada/langkit/langkit-2018.ebuild +++ b/dev-ada/langkit/langkit-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,15 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} - || ( - dev-ada/gnatcoll[gnat_2017,iconv,shared] - dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared] - ) + dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml dev-python/enum34 |