diff options
Diffstat (limited to 'dev-ada')
-rw-r--r-- | dev-ada/Manifest.gz | bin | 4914 -> 4905 bytes | |||
-rw-r--r-- | dev-ada/gnatcoll-bindings/Manifest | 2 | ||||
-rw-r--r-- | dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild | 98 | ||||
-rw-r--r-- | dev-ada/gnatcoll-core/Manifest | 5 | ||||
-rw-r--r-- | dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch | 11 | ||||
-rw-r--r-- | dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild | 123 | ||||
-rw-r--r-- | dev-ada/gnatcoll-core/metadata.xml | 1 | ||||
-rw-r--r-- | dev-ada/gprconfig_kb/Manifest | 1 | ||||
-rw-r--r-- | dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch | 138 |
9 files changed, 139 insertions, 240 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz Binary files differindex 1cb6ddd0a06d..9bd87746232e 100644 --- a/dev-ada/Manifest.gz +++ b/dev-ada/Manifest.gz diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest index 1dbaa0e5488a..6905f83397e7 100644 --- a/dev-ada/gnatcoll-bindings/Manifest +++ b/dev-ada/gnatcoll-bindings/Manifest @@ -1,6 +1,4 @@ AUX gnatcoll-bindings-23.0.0-py_3_11.patch 412 BLAKE2B 3d327f02b5305a7e0aa5414ec83be80ae62b6a2b93581846acf6306a3ab364c8ae07137bdffea1fce69a51c6bfa707daa0555ae49b7e69db0301c227896836ff SHA512 2539d5d96ec00cccef5b42fe5795d5cedffc528bb9e4d328007718f5189c61657cc77daf80a5f7da0a157c482e7146116ab6da8a9dd10afe68e1a3f30e3c548d -DIST gnatcoll-bindings-23.0.0.tar.gz 251006 BLAKE2B 8cc5ada5c76d146d80c1b83bfbcfea28b9951339eb5dcdca40a4b40fdeb2ed2ad1971deea60b6fdc7cc2565745958d13fcc1acbd012465dea4cb2535e947af34 SHA512 3f92d3c95ffbcf96df53a1db39c9b829ae3d0a9ee3695d3d7726168bd6744ca4d4dfe4b224b50b50603c6295e1c0c6dd3d9940cf9e20c147a3bed8e6cc39c1ce DIST gnatcoll-bindings-24.0.0.tar.gz 253286 BLAKE2B 6f9ee60a298f98921df3f8bfd3c6e21a3b54412dfea3d67cb6fe0e85d7ba90f17f83d564d9853e989cd60b0d9d9052694a14a70d10a4f70d161878501edd036b SHA512 d82f593cd0a2822d0007ba768a05e9870aa80b47232154008ea91af4ec758df1b23b92eb5264a58f2b4bedf775d143ce7119046a9ba8f7d5496ed89f3a4a2118 -EBUILD gnatcoll-bindings-23.0.0-r2.ebuild 2525 BLAKE2B e24fe93e0f43c5e52219a685ef2c3eed738a3651e250eb0f5c296b900a514fece901440f126c25a55f80b6c762cd739a99f2b6dd1863ed4f155a8d4106b7cdfe SHA512 de9381f3b6327e40e9140b7e9a03f521e67bba6d86118091ae556ce4935afa5678e555ebfe8dd1c3fc024b07bcbed24c213a2438047723fe5745e341bbac80ed EBUILD gnatcoll-bindings-24.0.0-r1.ebuild 2541 BLAKE2B a298d268e14f8f498dae13998e5f6cc034ed5cb499861e67ddd52551b33a7c7d98f758d0696fc8df51f74c6ec43cb25f8333dc9e9b491378f25ddab5ca2a3596 SHA512 b0b1ee319aa5f8f2e0bf718d7049e76764cfc5bcd1b5fe39280efa47b7703573f3425bc7a529d53bf0181a0729f4fafd21a7ade1e6b56f09ff981284d078073b MISC metadata.xml 1172 BLAKE2B 23758b9a71c24a6e635488947a6491713dd69750c62715b1fe0eb12db380d1ecc80ebb4941a00a9ae01ce2009316849e802560bc52402fed64b671547951cf89 SHA512 1ea356da231ee9b42df8733e0ca6c3cbb5e3a2f0eb143bc894a8961e82b69f2e05b0f5d8dba309dc6b0556c4340bb51175fe9aa5a272aae006eed4a2cf449098 diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild deleted file mode 100644 index 1ef0b150ddc0..000000000000 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 ) -inherit ada multiprocessing python-single-r1 - -DESCRIPTION="GNAT Component Collection" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="amd64 x86" -IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog" -REQUIRED_USE="|| ( shared static-libs static-pic ) - || ( gmp iconv lzma openmp python readline syslog ) - ${PYTHON_REQUIRED_USE} - ${ADA_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - ${ADA_DEPS} - dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?] - gmp? ( dev-libs/gmp:* ) - lzma? ( app-arch/xz-utils ) - openmp? ( dev-lang/gnat-gpl:=[openmp] ) - " -DEPEND="${RDEPEND} - dev-ada/gprbuild[${ADA_USEDEP}]" - -QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.* - -PATCHES=( "${FILESDIR}"/${P}-py_3_11.patch ) - -pkg_setup() { - python-single-r1_pkg_setup - ada_pkg_setup -} - -src_prepare() { - rm -r python || die - mv python3 python || die - default -} - -src_compile() { - build () { - gprbuild -j$(makeopts_jobs) -m -p -v \ - -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ - -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ - -XGNATCOLL_VERSION=${PV} \ - -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ - -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in gmp iconv lzma python readline syslog ; do - if use $dir; then - build $dir $lib - fi - done - if use openmp; then - build omp $lib - fi - fi - done -} - -src_install() { - build () { - gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ - -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ - -XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \ - -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in gmp iconv lzma python readline syslog ; do - if use $dir; then - build $dir $lib - fi - done - if use openmp; then - build omp $lib - fi - fi - done - rm -rf "${D}"/usr/share/gpr/manifests - einstalldocs -} diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest index c6fe596de2ae..0e4dc45ea9b9 100644 --- a/dev-ada/gnatcoll-core/Manifest +++ b/dev-ada/gnatcoll-core/Manifest @@ -1,5 +1,8 @@ AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64 AUX gnatcoll-core-24.0.0-gentoo.patch 607 BLAKE2B 9138e65de3403760b3a56a622c002e064c4bd145c1c544b74221538fe04849f340f042a58301de315bf35f8edf804b49034885d5c43dd40909155243532ef904 SHA512 4c5d9ea25ac786e580ef3191e2a33546f9cd85d88bfee0ba89ca8edfbe5d3602485b780d6cf58240d71d3c5f872c53ddba0305894919a53e223727233e21d474 +AUX gnatcoll-core-25.0.0-gentoo.patch 559 BLAKE2B 4df9019ef026ee7ac367ed2dd01bb0dcb9553963cf25918309d09bda68bc5cc6302b34dc3a9b8d13da7d7f08be6ebe04f46984563d14edd04f3af06095748b45 SHA512 c029fe6a6c1ac21037b025a980d59d08b27b6eaef949357ff8f2c18583fe37a73ae83e74231e43fd170f33cd62c3273fefc8e399a65c6dead9a6abd6b0b6092f DIST gnatcoll-core-24.0.0.tar.gz 764526 BLAKE2B f96b24dcac2af84802244ed93570f0a922ab0901ecf871fa4995f4c24607cdbd8d91fc760acf35024fe41a066fb307442396cb8c125c74363e0c9276d114ab5a SHA512 1f1d470e7b74f238682f0938efe04c303c6bfca5a6b723eb789f5cb4bd33a199a9f2323626b8887758f01709ab1ba4d8045c56ce45f02e535babca4025662d9f +DIST gnatcoll-core-25.0.0.tar.gz 7492612 BLAKE2B 6c9653b74d575b24a5433dc56214f9fd55d8dfce65921d2f3172521d3f2c542e34e09df99c224634bf87da6068cffd4f47fdf6ed68f2b913d355a9f6ebff1624 SHA512 efa19b9760bd16b402445d4932dfd28f087f9a09b91ec688c6976b7b83fe5986580b1871378ac024e9a712df8ee75963e5dc88629a72ee1ce76f1d1403b8e122 EBUILD gnatcoll-core-24.0.0-r3.ebuild 1881 BLAKE2B 11df5593012394df1a96aee6758988f137e593a38c63cc703947610518abcc0e2f2b26cb1ec5070d0aa175cdbd0deaaa96054a22603b4053885c8e94b7117daa SHA512 c7abea82ff78f49874455dc4872f24147cfce35898527e83c2cd4367d6736a738662a7ad4035bdd69d69d7dac3d6497047e9eb18be82b0711b29b77d436a30fe -MISC metadata.xml 1182 BLAKE2B 3f9bf3841b3006cc8ca840bab94c1324f2fca7ceab33eabcb2d6b6d6a7b27562a24821129285ded3e764b3185ca81b6774fa11e54b27f392b6234fd66223e5b4 SHA512 ec28eeb7f441eb5e5181dbc6bab19b647fba1cf2786238353040d409afaf520803c34b26a94c8583fc2858cb3e674a3ac525e42f6b447f478fb2cdae4c9add18 +EBUILD gnatcoll-core-25.0.0.ebuild 2995 BLAKE2B 88cfcda02cb966b5a30edb5a744f0e24420b525821df32a799c177ae772716c06a796b7f8a2a908d7303f7490b508d5b237f178bb8def8d7c9ea85387717f798 SHA512 89129739b46350b96ceaa62b69c2a4688eed5f773a9401a76a78176d01911404c9300fe00e2c4781f544b91bc24d86cb92a15df990a589955a668b0c38a41da6 +MISC metadata.xml 1237 BLAKE2B 06a5984592bbeb2fa8f663b61eeecded49363cebf58d5b51d70768bebc485035e5c718ba671c4d9e178ca13be82dc56bbac9a0eb39b8dd1c992f019d45affa7c SHA512 6762bd7b0ec30cefbfc94a6e0572ddbeedc89161ae1cdc291c0dd35405be20439bb2bd585b74cbe20db50a3522405f449b5507d592771704a95b0d1f3775b9ea diff --git a/dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch b/dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch new file mode 100644 index 000000000000..66862c6b600a --- /dev/null +++ b/dev-ada/gnatcoll-core/files/gnatcoll-core-25.0.0-gentoo.patch @@ -0,0 +1,11 @@ +--- a/projects/src/gnatcoll-projects.ads 2025-01-04 15:16:43.534598733 +0100 ++++ b/projects/src/gnatcoll-projects.ads 2025-01-04 15:17:23.548103890 +0100 +@@ -2093,7 +2093,7 @@ + Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access; + -- The list of source files in Predefined_Source_Path + +- Default_Gnatls : GNAT.Strings.String_Access := new String'("gnatls"); ++ Default_Gnatls : GNAT.Strings.String_Access := new String'("@GNATLS@"); + -- The default gnatls command to run. + + Xrefs_Subdir : GNAT.Strings.String_Access; diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild new file mode 100644 index 000000000000..0694b04c8e71 --- /dev/null +++ b/dev-ada/gnatcoll-core/gnatcoll-core-25.0.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +ADA_COMPAT=( gcc_13 gcc_14 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) +inherit ada python-any-r1 multiprocessing + +DESCRIPTION="GNAT Component Collection Core packages" +HOMEPAGE="https://github.com/AdaCore/gnatcoll-core/" +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc minimal +projects +shared static-libs static-pic test" +RESTRICT="test" +REQUIRED_USE="|| ( shared static-libs static-pic ) + ${ADA_REQUIRED_USE} + projects? ( !minimal )" + +RDEPEND=" + projects? ( ~dev-ada/libgpr-${PV}:=[${ADA_USEDEP},shared?,static-libs?,static-pic?] ) +" +BDEPEND="${RDEPEND} + dev-ada/gprbuild[${ADA_USEDEP}] + $(python_gen_any_dep ' + test? ( dev-ada/e3-testsuite[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] + ) + ')" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +python_check_deps() { + if use test; then + python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]" || return 1 + fi; + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" +} + +pkg_setup() { + if use doc || use test; then + python-any-r1_pkg_setup + fi + ada_pkg_setup +} + +src_prepare() { + default + sed -i \ + -e "s:@GNATLS@:${GNATLS}:g" \ + projects/src/gnatcoll-projects.ads \ + || die + rm -r testsuite/tests/file_indexes || die + rm -r testsuite/tests/vfs/basic || die + rm -r testsuite/tests/os/fsutil/sync_trees/error || die + rm -r testsuite/tests/os/process/priority_unix || die +} + +src_compile() { + export GPR_PROJECT_PATH=minimal:core + build() { + gprbuild -v -p -m -P$2/gnatcoll_$2.gpr -j$(makeopts_jobs) \ + -XGNATCOLL_VERSION=$(ver_cut 1-2) -XLIBRARY_TYPE=$1 \ + -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die + } + buildAll () { + build $1 minimal + use minimal && return + build $1 core + use projects && build $1 projects + } + if use shared; then + buildAll relocatable + fi + if use static-libs; then + buildAll static + fi + if use static-pic; then + buildAll static-pic + fi + use doc && emake -C docs html +} + +src_test() { + #To be run after installation + cd testsuite + ./run-tests || die +} + +src_install() { + export GPR_PROJECT_PATH=minimal:core + build() { + gprinstall -v -P$2/gnatcoll_$2.gpr -XGNATCOLL_VERSION=$(ver_cut 1-2) \ + -p -f --prefix="${D}"/usr --sources-subdir=include/gnatcoll_$2 \ + -XLIBRARY_TYPE=$1 --build-name=$1 --build-var=LIBRARY_TYPE || die + } + buildAll () { + build $1 minimal + use minimal && return + build $1 core + use projects && build $1 projects + } + if use shared; then + buildAll relocatable + fi + if use static-libs; then + buildAll static + fi + if use static-pic; then + buildAll static-pic + fi + insinto /usr/share/gpr + doins gnatcoll.gpr + use doc && HTML_DOCS=( docs/_build/html/* ) + einstalldocs + rm -r "${D}"/usr/share/gpr/manifests +} diff --git a/dev-ada/gnatcoll-core/metadata.xml b/dev-ada/gnatcoll-core/metadata.xml index 5cad23aa44ea..5cf893d36197 100644 --- a/dev-ada/gnatcoll-core/metadata.xml +++ b/dev-ada/gnatcoll-core/metadata.xml @@ -5,6 +5,7 @@ <email>ada@gentoo.org</email> </maintainer> <use> + <flag name="projects">Build gnatcoll_projects</flag> <flag name="shared">Build shared library</flag> <flag name="static-pic">Build static library with pic code</flag> </use> diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest index eb70aa9c30b5..26fad8ec20d5 100644 --- a/dev-ada/gprconfig_kb/Manifest +++ b/dev-ada/gprconfig_kb/Manifest @@ -1,4 +1,3 @@ -AUX gprconfig_kb-23.0.0-gentoo.patch 5997 BLAKE2B ab522e5510b9a8cea9d0ad6bf9c9b27d74d00b8ab330f32fdb301f4441279a193ef8d07c8b2859dd739613baf32f0ffbeeb80b9b0e0d3370d1b6a87248febe67 SHA512 13c47f87f5c5dcee460e4380cc02cfdc849ee0a28092aa6aacd4371c7d7362099f2ef722a084ef9bb4f3fdc52d58cecf428e7062533ffd6c9558e06bf52e18f8 AUX gprconfig_kb-24.0.0-gentoo.patch 5724 BLAKE2B d48884538f67554db7d48d185a18f10c17eb94aee597c0055e889e7c1f8707677cb4fcc2d09214e2e519244e222aaa722103d92576d3c6c8c956500adf7da7a7 SHA512 17e653cbe43f4d09d891c83a14ae373685782d22bacd8a713add769d1661f6744ce2b40c6bdc5affb034ed7d64d5c6a398f412516d029ca7d3fa48ff78eb6d47 AUX gprconfig_kb-25.0.0-gentoo.patch 7020 BLAKE2B ba0009d5eee186f9ae7502b81caf69f894b739423901836c5b60ee5b87d2668ed10b9088828d5c4dc9fb72eddbac0fd7ff3b380efd43e1e0748ca2fc1750d660 SHA512 86a6398fb43978a6debb7fb4e3aabbc88bf7a0803b3828777bbcd941ea9cbfbf75e30dcdd9a6e92d5581668808766b3d5fc3d721834b2d5f6345124a7ede961e DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7 SHA512 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84 diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch deleted file mode 100644 index 6808542199fa..000000000000 --- a/dev-ada/gprconfig_kb/files/gprconfig_kb-23.0.0-gentoo.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- a/db/compilers.xml 2019-06-01 21:29:57.611722804 +0200 -+++ b/db/compilers.xml 2019-06-01 21:42:56.000608601 +0200 -@@ -20,7 +20,7 @@ - <!-- GCC 3.x & 4.x (not for GNAT Pro)--> - <compiler_description> - <name>GCC</name> -- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-)?gcc(-\d+)?</executable> -+ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-)?gcc-@VER@</executable> - <version> - <external>$EXEC -v</external> - <nogrep regexp="for GNAT Pro"></nogrep> -@@ -173,18 +173,18 @@ - --> - <compiler_description> - <name>GNAT</name> -- <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-qnx.*|.*-rtems.*)?gnatls</executable> -+ <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|.*-qnx.*|.*-rtems.*)?gnatls-@VER@</executable> - <version> -- <external>${PREFIX}gnatls -v --version</external> -+ <external>${EXEC} -v --version</external> - <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep> - </version> - <languages>Ada</languages> - <variable name="gcc_version"> -- <external>${PREFIX}gcc -v</external> -+ <external>${PREFIX}gcc-@VER@ -v</external> - <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep> - </variable> - <variable name="gcc_version_major"> -- <external>${PREFIX}gcc -v</external> -+ <external>${PREFIX}gcc-@VER@ -v</external> - <grep regexp="^[-\w]*gcc \S+ (\d+)\.\d+\.\d+" group="1"></grep> - </variable> - <runtimes default="default,kernel,native"> -@@ -194,7 +194,7 @@ - <directory group="2" >\.\./$TARGET/lib(32|64)?/gnat/(.*)/adalib/</directory> - </runtimes> - <target> -- <external>${PREFIX}gcc -dumpmachine</external> -+ <external>${PREFIX}gcc-@VER@ -dumpmachine</external> - <grep regexp="[^\r\n]+"></grep> - </target> - </compiler_description> -@@ -245,7 +245,7 @@ - <!-- Generic C compiler for LLVM --> - <compiler_description> - <name>C_LLVM</name> -- <executable>clang</executable> -+ <executable>fake-clang</executable> - <version> - <external>clang --version</external> - -@@ -475,7 +475,7 @@ - <!-- LLVM Compiler --> - <compiler_description> - <name>LLVM</name> -- <executable>clang</executable> -+ <executable>fake-clang</executable> - <version> - <external>clang -v</external> - <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep> ---- a/db/gnat.xml 2019-06-01 21:53:53.383281607 +0200 -+++ b/db/gnat.xml 2019-06-01 21:57:08.414196529 +0200 -@@ -10,7 +10,7 @@ - &filter_gnat; - <config> - package Compiler is -- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; -+ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; - for Language_Kind ("Ada") use "unit_based"; - for Dependency_Kind ("Ada") use "ALI_File"; - for Leading_Required_Switches ("Ada") use -@@ -27,6 +27,9 @@ - for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; - for Driver ("Ada") use - "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; -+ for Switches ("Ada") use ("--gnatbind_path=${PREFIX(ada)}gnatbind-@VER@"); -+ for Required_Switches ("Ada") use -+ Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); - end Binder; - - for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; ---- a/db/c.xml 2019-06-01 21:57:36.244755708 +0200 -+++ b/db/c.xml 2019-06-01 21:59:14.919191663 +0200 -@@ -25,7 +25,7 @@ - </compilers> - <config> - package Compiler is -- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; -+ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; - end Compiler; - </config> - </configuration> ---- a/db/linker.xml 2021-12-21 22:36:01.054738486 +0100 -+++ b/db/linker.xml 2021-12-21 22:36:59.973738600 +0100 -@@ -128,9 +128,13 @@ - <host name="^i686.*-linux.*$" /> - </hosts> - <config> -- for Object_Lister use ("nm", "-g"); -+ NM := External("NM", "nm"); -+ for Object_Lister use (NM, "-g"); - for Object_Lister_Matcher use " [TDRB] (.*)"; - -+ LDFLAGS := External_As_List ("LDFLAGS", " "); -+ for Leading_Library_Options use LDFLAGS; -+ - package Linker is - for Export_File_Format use "GNU"; - for Export_File_Switch use "-Wl,--version-script="; -@@ -917,7 +921,8 @@ - <host name="^x86_64-.*linux.*" /> - </hosts> - <config> -- for Archive_Builder use ("ar", "cr"); -+ AR := External("AR", "ar"); -+ for Archive_Builder use (AR, "cr"); - for Archive_Builder_Append_Option use ("q"); - for Archive_Indexer use ("ranlib"); - for Archive_Suffix use ".a"; -@@ -1274,7 +1279,7 @@ - </targets> - <config> - for Library_Partial_Linker use -- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib") -+ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib") - & GCC_No_Pie - & ("-Wl,-r", "-o"); - </config> -@@ -1295,7 +1300,7 @@ - </targets> - <config> - for Library_Partial_Linker use -- ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib") -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib") - & GCC_No_Pie - & ("-Wl,-r", "-o"); - </config> |