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

[Anthony G. Basile]

commit:     765628f6fd1f76bc0a23de190646846ded1c6995
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 20:11:58 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  5 20:11:58 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=765628f6

tools-musl: automatically detect amd64 vs i686

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

diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 4ff3785..c9127b4 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -1,15 +1,18 @@
 #!/bin/bash
 
-MYARCH=${1:-"amd64"}
-
-if [[ "$MYARCH" != "amd64" && "$MYARCH" != "i686" ]]; then
+TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
+
+if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then
+	MYARCH="i686"
+	ALTARCH="i386"
+elif [[ "${TEST_ARCH}" == "x86-64" ]]; then
+	MYARCH="amd64"
+	ALTARCH="x86_64"
+else
 	echo "Unsupported arch $MYARCH"
 	exit
 fi
 
-[[ "$MYARCH" == "amd64" ]] && ALTARCH="x86_64"
-[[ "$MYARCH" == "i686" ]] && ALTARCH="i386"
-
 ROOTFS="stage4-${MYARCH}-musl-vanilla"
 PWD="$(pwd)"
 
@@ -18,9 +21,9 @@ prepare_etc () {
 	cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
 
 	if [[ "$MYARCH" == "amd64" ]]; then
-		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/make.conf
+		sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	elif [[ "$MYARCH" == "i686" ]]; then
-		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/make.conf
+		sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf
 	fi
 }