From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76DF615815E for ; Fri, 9 Feb 2024 12:18:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DFDDE2A3A; Fri, 9 Feb 2024 12:18:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83579E2A3A for ; Fri, 9 Feb 2024 12:18:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E070335D6D for ; Fri, 9 Feb 2024 12:18:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0211F14BD for ; Fri, 9 Feb 2024 12:18:21 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1707480991.652b5e27bb7c15574678d9cd837f6e24639e713b.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout/baselayout-2.14-r3.ebuild sys-apps/baselayout/baselayout-9999.ebuild X-VCS-Directories: sys-apps/baselayout/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 652b5e27bb7c15574678d9cd837f6e24639e713b X-VCS-Branch: master Date: Fri, 9 Feb 2024 12:18:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d31101d-20ae-4ad0-9f8f-d365d7c81bcd X-Archives-Hash: 3bc89c7a0d43f2fbb749f3d469947a72 commit: 652b5e27bb7c15574678d9cd837f6e24639e713b Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Feb 9 12:16:31 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Feb 9 12:16:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652b5e27 sys-apps/baselayout: Add bugfix for riscv multilib stage builds Signed-off-by: Andreas K. Hüttel gentoo.org> ...elayout-9999.ebuild => baselayout-2.14-r3.ebuild} | 20 ++++++++++++++++---- sys-apps/baselayout/baselayout-9999.ebuild | 18 +++++++++++++++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-2.14-r3.ebuild similarity index 95% copy from sys-apps/baselayout/baselayout-9999.ebuild copy to sys-apps/baselayout/baselayout-2.14-r3.ebuild index 76beeff5aac8..820c4f714c44 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-2.14-r3.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~riscv" fi LICENSE="GPL-2" @@ -67,11 +67,23 @@ multilib_layout() { continue fi if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then + # for the special case of riscv multilib, we drop the + # second part of two-component libdirs, e.g. lib64/lp64 libdir="${libdir%%/*}" dir="${prefix}${libdir}" - einfo "symlinking ${dir} to usr/${libdir}" - ln -s usr/${libdir} ${dir} || - die "Unable to make ${dir} symlink" + if [[ -h "${dir}" ]] ; then + if use riscv ; then + # with riscv we get now double entries so we + # need to ignore already existing symlinks + einfo "symlink ${dir} already exists (riscv)" + else + die "symlink ${dir} already exists" + fi + else + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die "Unable to make ${dir} symlink" + fi else einfo "creating directory ${dir}" mkdir -p "${dir}" || diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 76beeff5aac8..8dfcf1d42876 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -67,11 +67,23 @@ multilib_layout() { continue fi if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then + # for the special case of riscv multilib, we drop the + # second part of two-component libdirs, e.g. lib64/lp64 libdir="${libdir%%/*}" dir="${prefix}${libdir}" - einfo "symlinking ${dir} to usr/${libdir}" - ln -s usr/${libdir} ${dir} || - die "Unable to make ${dir} symlink" + if [[ -h "${dir}" ]] ; then + if use riscv ; then + # with riscv we get now double entries so we + # need to ignore already existing symlinks + einfo "symlink ${dir} already exists (riscv)" + else + die "symlink ${dir} already exists" + fi + else + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die "Unable to make ${dir} symlink" + fi else einfo "creating directory ${dir}" mkdir -p "${dir}" ||