Gentoo Archives: gentoo-commits

From: Thomas Sachau <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:multilib commit in: bin/
Date: Sat, 30 Oct 2021 09:33:44
Message-Id: 1629636396.be19c869f7ac79ddc79599a857d9d2b0603b13ab.tommy@gentoo
1 commit: be19c869f7ac79ddc79599a857d9d2b0603b13ab
2 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 22 12:46:36 2021 +0000
4 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 22 12:46:36 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=be19c869
7
8 Add some extra code for libgpg-error
9
10 Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
11
12 bin/auto-multilib.sh | 11 +++++++++++
13 1 file changed, 11 insertions(+)
14
15 diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
16 index 103565209..2df2d9b4e 100755
17 --- a/bin/auto-multilib.sh
18 +++ b/bin/auto-multilib.sh
19 @@ -283,6 +283,17 @@ _finalize_abi_install() {
20 ln -s i686-pc-linux-gnu-llvm-config "${D}"/usr/lib/llvm/"${PV//.*}"/bin/llvm-config-x86
21 fi
22 fi
23 + if [[ "${PN}" == "libgpg-error" ]] ; then
24 + if [[ ${ABI} == ${first_installed_abi} ]] ; then
25 + mv "${D}"/usr/bin/x86_64-pc-linux-gnu-gpg-error-config-amd64 "${D}"/usr/bin/gpg-error-config-amd64 || die
26 + rm "${D}"/usr/bin/{x86_64-pc-linux-gnu-gpg-error-config,gpg-error-config} || die
27 + ln -s /bin/abi-wrapper "${D}"/usr/bin/gpg-error-config || die
28 + ln -s gpg-error-config "${D}"/usr/bin/x86_64-pc-linux-gnu-gpg-error-config || die
29 + else
30 + mv "${D}"/usr/bin/i686-pc-linux-gnu-gpg-error-config-x86 "${D}"/usr/bin/gpg-error-config-x86 || die
31 + ln -s gpg-error-config "${D}"/usr/bin/i686-pc-linux-gnu-gpg-error-config || die
32 + fi
33 + fi
34
35 local noabi=()
36 for i in ${MULTILIB_ABIS}; do