commit: a754b8a583764f345a2c60d42b51589f735971c2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Jan 4 22:35:00 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sun Jan 5 08:27:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a754b8a5
dev-ada/gprconfig_kb: drop 23.0.0, fix ~arm64: See: https://github.com/AdaCore/gprconfig_kb/issues/23 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/gprconfig_kb/Manifest | 1 - .../files/gprconfig_kb-25.0.0-gentoo.patch | 41 ++++++++++++++++++++++ dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild | 39 -------------------- dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild | 4 +-- 4 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dev-ada/gprconfig_kb/Manifest b/dev-ada/gprconfig_kb/Manifest index a43f6babeb46..983450cc1dff 100644 --- a/dev-ada/gprconfig_kb/Manifest +++ b/dev-ada/gprconfig_kb/Manifest @@ -1,3 +1,2 @@ -DIST gprconfig_kb-23.0.0.tar.gz 42132 BLAKE2B ed39c8f199e0cd31dbd3b587bcf589d62befc29ab907c54d9bcbc08887239a5ce12bc22428631e32d8c69c0c6bdd01e4591d050f480ea461f4d8af0f1cc05288 SHA512 505b632ff744c8fbb75b72d0f406a88a2c675d5afead9f0f8ca282ae79ca4e38c174dfe424c4c4a55835a9ebdbc6d0a2f329592bd6dfb87d5493e8473a0b2376 DIST gprconfig_kb-24.0.0.tar.gz 43010 BLAKE2B af246be2c5683655bf023e07b08539647d8a351f8f5d8eace77665980fca80855262028667a94b5d9ed9ebf2af16d061968822ef923505c7a4de6497baefa3d7 SHA512 1bd28b7eba57a8952635f3fb61e06278935c31ed196182e19e9e8c2ffa3edbccea5a9b97b3f5a3c820e7c3f5b6878d87f7b42d66a7f57e083d0b56cb91a6eb84 DIST gprconfig_kb-25.0.0.tar.gz 44165 BLAKE2B e026f7f644dfd8ba4665fd22ef6cb5abcdb1013779a8119e1be3dc3313cca37af138e1a351f2fc8dd10780009d0d98e0ab60e73293ea508acbe4cd5a836bdb16 SHA512 afc1754efdf6e3cbff9752a182cd063f83965c6a13e53930a14f806a46e3cbfb0afed8f8e11b098986227f27a1a67b45d22369adaa39a5dc1f2a8cc494f789e8 diff --git a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch index be64afb433ef..c65cc6e1eab1 100644 --- a/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch +++ b/dev-ada/gprconfig_kb/files/gprconfig_kb-25.0.0-gentoo.patch @@ -99,6 +99,45 @@ package Linker is for Export_File_Format use "GNU"; for Export_File_Switch use "-Wl,--version-script="; +@@ -696,34 +696,19 @@ + <configuration> + <!-- aarch64-linux - native compiler. --> + <targets> +- <target name="^aarch64-linux-gnu$" /> ++ <target name="^aarch64(-unknown)-linux-gnu$" /> + </targets> + <hosts> +- <host name="^aarch64-linux-gnu$" /> ++ <host name="^aarch64(-unknown)-linux-gnu$" /> + </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"; + </config> + </configuration> +- +- <configuration> +- <!-- aarch64-linux - cross compiler. --> +- <targets> +- <target name="^aarch64-.*linux-gnu$" /> +- </targets> +- <hosts negate="true"> +- <host name="^aarch64-linux-gnu$" /> +- </hosts> +- <config> +- for Archive_Builder use ("aarch64-linux-gnu-ar", "cr"); +- for Archive_Builder_Append_Option use ("q"); +- for Archive_Indexer use ("aarch64-linux-gnu-ranlib"); +- for Archive_Suffix use ".a"; +- </config> +- </configuration> + + <configuration> + <targets> @@ -1022,7 +1026,8 @@ <host name="^x86_64-.*linux.*" /> </hosts> @@ -127,3 +166,5 @@ & GCC_No_Pie & ("-Wl,-r", "-o"); </config> +--- db/linker.xml.old 2025-01-04 23:22:02.343268592 +0100 ++++ db/linker.xml 2025-01-04 23:24:11.562660779 +0100 diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild deleted file mode 100644 index 5438b3d85e97..000000000000 --- a/dev-ada/gprconfig_kb/gprconfig_kb-23.0.0-r3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ADA_COMPAT=( gnat_2021 gcc_12 ) - -inherit ada - -DESCRIPTION="GPR configuration knowledge base" -HOMEPAGE="https://www.adacore.com/"; -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - default - - sed -i \ - -e "s:@VER@:${GCCPV}:g" \ - db/compilers.xml \ - db/gnat.xml \ - db/c.xml \ - db/linker.xml \ - || die -} - -src_install() { - insinto /usr/share/gprconfig - doins db/*.xml - doins db/*.ent - einstalldocs -} diff --git a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild index 1f327d97a90c..a7e89934ab37 100644 --- a/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild +++ b/dev-ada/gprconfig_kb/gprconfig_kb-25.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
