[patch] Patch

baselayout.patch (text/plain), 4.19 KB, created by Arfrever Frehtes Taifersar Arahesis on 2020-06-20 22:22:50 UTC

From eafd935218f6d2b95f597d05d0927a90ac0ac0dd Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
Date: Sat, 20 Jun 2020 22:18:28 +0000
Subject: [PATCH] sys-apps/baselayout: Fix installation on RISC-V.

Fix some quoting.

Closes: https://bugs.gentoo.org/728674
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <[e-mail]>
---
 sys-apps/baselayout/baselayout-2.6-r1.ebuild | 8 +++++---
 sys-apps/baselayout/baselayout-2.7.ebuild    | 8 +++++---
 sys-apps/baselayout/baselayout-9999.ebuild   | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
index 5471a444eb2..6c0d4b28732 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
 		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -43,7 +43,8 @@ multilib_layout() {
 				fi
 				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
 					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
+					mkdir -p "${dir%/*}" || die
+					ln -s usr/${libdir} "${dir}" ||
 						die " Unable to make ${dir} symlink"
 				else
 					einfo "creating directory ${dir}"
@@ -153,7 +154,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				mkdir -p "${EROOT}${libdir%/*}" || die
+				ln -s usr/${libdir} "${EROOT}${libdir}" || die
 			fi
 		done
 	fi
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index 104cf105212..f8883e48f95 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
 		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -43,7 +43,8 @@ multilib_layout() {
 				fi
 				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
 					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
+					mkdir -p "${dir%/*}" || die
+					ln -s usr/${libdir} "${dir}" ||
 						die " Unable to make ${dir} symlink"
 				else
 					einfo "creating directory ${dir}"
@@ -153,7 +154,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				mkdir -p "${EROOT}${libdir%/*}" || die
+				ln -s usr/${libdir} "${EROOT}${libdir}" || die
 			fi
 		done
 	fi
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a94078654b8..080c03f3d21 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
 		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -43,7 +43,8 @@ multilib_layout() {
 				fi
 				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
 					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
+					mkdir -p "${dir%/*}" || die
+					ln -s usr/${libdir} "${dir}" ||
 						die " Unable to make ${dir} symlink"
 				else
 					einfo "creating directory ${dir}"
@@ -153,7 +154,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				mkdir -p "${EROOT}${libdir%/*}" || die
+				ln -s usr/${libdir} "${EROOT}${libdir}" || die
 			fi
 		done
 	fi
-- 
2.27.0