diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2017-12-15 09:14:55 +0100 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2017-12-15 09:14:55 +0100 |
| commit | bfd90d29b24f09bf04acce72626a60ae99425c9a (patch) | |
| tree | c2b2b0e01c8568c8b60aae8f4f83ae8ed41a5b70 | |
| parent | dev-libs/libtommath: Version bump. (diff) | |
| download | gentoo-bfd90d29b24f09bf04acce72626a60ae99425c9a.tar.gz gentoo-bfd90d29b24f09bf04acce72626a60ae99425c9a.tar.bz2 gentoo-bfd90d29b24f09bf04acce72626a60ae99425c9a.zip | |
dev-ada/libadalang: Use dev-python/quex
Package-Manager: Portage-2.3.13, Repoman-2.3.3
| -rw-r--r-- | dev-ada/libadalang/Manifest | 1 | ||||
| -rw-r--r-- | dev-ada/libadalang/files/libadalang-2017-gentoo.patch | 12 | ||||
| -rw-r--r-- | dev-ada/libadalang/libadalang-2017.ebuild | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest index a3b6747a28d5..3e4dbf4d1804 100644 --- a/dev-ada/libadalang/Manifest +++ b/dev-ada/libadalang/Manifest @@ -1,3 +1,2 @@ DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7 -DIST quex-0.65.4.tar.gz 2202154 BLAKE2B 6b273998c9641aeee458291245a4fb956b5fe9b66d8c42f0c1d9b360a4d171c830a1d487bcbab9ccea49d10b7532ed488ce66dc165f31cce9521f97c5a4575f4 SHA512 0b11d7e5c5165674626fbbe7f54853656c579c63b78bd2fef2f5a9b316171dc647812d9a37df4e7c49c05de11a307b6425089f4ab281affb6c03a9cf09e2a035 diff --git a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch index a54f0cf98583..bf4dfcde83d0 100644 --- a/dev-ada/libadalang/files/libadalang-2017-gentoo.patch +++ b/dev-ada/libadalang/files/libadalang-2017-gentoo.patch @@ -30,3 +30,15 @@ end Compiler; end P; '''.format(main_source=compile_units[0], +--- work/langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100 ++++ work/langkit-gps-src/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', + quex_spec): +- quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py") +- subprocess.check_call([sys.executable, quex_py_file, "-i", ++ subprocess.check_call(["quex", "-i", + quex_file, + "-o", "quex_lexer", + "--buffer-element-size", "4", diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild index 5a0a5cfba07e..958c5382196e 100644 --- a/dev-ada/libadalang/libadalang-2017.ebuild +++ b/dev-ada/libadalang/libadalang-2017.ebuild @@ -11,7 +11,6 @@ DESCRIPTION="high performance semantic engine for the Ada programming language" HOMEPAGE="https://libre.adacore.com/" SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042 -> ${P}-src.tar.gz - mirror://sourceforge/quex/quex-0.65.4.tar.gz http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044 -> langkit-gps-src-${PV}.tar.gz" @@ -23,13 +22,12 @@ IUSE="gnat_2016 gnat_2017" RDEPEND="dev-python/pyyaml ${PYTHON_DEPS}" DEPEND="${RDEPEND} - dev-python/virtualenv dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=] dev-python/docutils dev-python/mako dev-python/enum34 + dev-python/quex dev-python/funcy" -#REQUIRED_USE="gnat_2016 !gnat_2017 ${PYTHON_REQUIRED_USE}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" S="${WORKDIR}" @@ -46,7 +44,6 @@ src_compile() { mkdir bin ln -sf /usr/bin/gnatbind-4.9.4 bin/gnatbind PATH=$PATH:${PWD}/bin \ - QUEX_PATH="${WORKDIR}"/quex-0.65.4 \ PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \ GCC=${CHOST}-gcc-4.9.4 ada/manage.py make || die } @@ -66,8 +63,7 @@ src_test () { src_install () { cd ${PN}-gps-src - QUEX_PATH="${WORKDIR}"/quex-0.65.4 \ - PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \ + PYTHONPATH=${PYTHONPATH}:"${WORKDIR}"/langkit-gps-src \ ada/manage.py install "${D}"usr python_domodule build/python/libadalang.py } |