commit: 2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Wed Dec 22 21:53:03 2021 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Wed Dec 22 21:53:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f80ac2e
dev-ada/gprbuild: use chost-ar Closes: https://bugs.gentoo.org/829701 Closes: https://bugs.gentoo.org/736036 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 +++++++++++ dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 11 +++++++++++ dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 1 + dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild | 1 + 4 files changed, 24 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch new file mode 100644 index 000000000000..77f0cfead7ed --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch @@ -0,0 +1,11 @@ +--- a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100 ++++ b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100 +@@ -864,7 +864,7 @@ + <host name="^x86_64-.*linux.*" /> + </hosts> + <config> +- for Archive_Builder use ("ar", "cr"); ++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); + for Archive_Builder_Append_Option use ("q"); + for Archive_Indexer use ("ranlib"); + for Archive_Suffix use ".a"; diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch new file mode 100644 index 000000000000..452733493ace --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch @@ -0,0 +1,11 @@ +--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100 ++++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100 +@@ -877,7 +877,7 @@ + <host name="^x86_64-.*linux.*" /> + </hosts> + <config> +- for Archive_Builder use ("ar", "cr"); ++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); + for Archive_Builder_Append_Option use ("q"); + for Archive_Indexer use ("ranlib"); + for Archive_Suffix use ".a"; diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild index 40a16cb9b2d4..405996ac11c4 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch + "${FILESDIR}"/${P}-ar.patch ) src_prepare() { diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild index 2a07d5e4d71d..06eb16e01235 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild @@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch + "${FILESDIR}"/${P}-ar.patch ) src_prepare() {
