[gentoo-commits] proj/releng:master commit in: tools-musl/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     13c0b6fe6d8f5272f77ee5542773f56f2b48080e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 13:07:10 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 13:07:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=13c0b6fe

tools-musl: fix ARCH dependant paths

---
 tools-musl/run.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 3874cb4..caf9491 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -3,38 +3,43 @@
 TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
 
 if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
-	MYARCH="i686"
+	MY_ARCH="i686"
 	ALTARCH="i386"
 elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
-	MYARCH="amd64"
+	MY_ARCH="amd64"
 	ALTARCH="x86_64"
 else
 	echo "Unsupported arch $TEST_ARCH"
 	exit
 fi
 
-ROOTFS="stage4-${MYARCH}-musl-vanilla"
+ROOTFS="stage4-${MY_ARCH}-musl-vanilla"
 PWD="$(pwd)"
 
 prepare_etc () {
 	mkdir -p "${ROOTFS}"/etc
 	cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
 
-	if [[ "$MYARCH" == "amd64" ]]; then
+	if [[ "$MY_ARCH" == "amd64" ]]; then
 		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf
-	elif [[ "$MYARCH" == "i686" ]]; then
-		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf
+	elif [[ "$MY_ARCH" == "i686" ]]; then
+		sed -i "s/ALTARCH/${MY_ARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	fi
 }
 
 prepare_usr_etc() {
 	mkdir -p "${ROOTFS}"/usr/etc
 
+	local PATH_ARCH
+
+	[[ "$MY_ARCH" == "amd64" ]] && PATH_ARCH="x86_64"
+	[[ "$MY_ARCH" == "i686" ]] && PATH_ARCH="i686"
+
 	cat <<-EOF > "${ROOTFS}"/usr/etc/ld-musl-${ALTARCH}.path
 	/lib
 	/usr/lib
-	/usr/lib/gcc/${ALTARCH}-gentoo-linux-musl/4.7.3
-	/usr/${ALTARCH}-gentoo-linux-musl/lib
+	/usr/lib/gcc/${PATH_ARCH}-gentoo-linux-musl/4.7.3
+	/usr/${PATH_ARCH}-gentoo-linux-musl/lib
 	EOF
 
 	ln -sf ld-musl-${ALTARCH}.path "${ROOTFS}"/usr/etc/ld-musl.path