chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools-musl: automatically detect amd64 vs i686

Browse source
This commit is contained in:
Anthony G. Basile 2014-02-05 15:11:58 -05:00
parent b81a0c3498
commit 765628f6fd
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools-musl/run.sh
View file

@ -1,15 +1,18 @@
#!/bin/bash #!/bin/bash
MYARCH=${1:-"amd64"} TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//')
if [[ "$MYARCH" != "amd64" && "$MYARCH" != "i686" ]]; then 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" echo "Unsupported arch $MYARCH"
exit exit
fi fi
[[ "$MYARCH" == "amd64" ]] && ALTARCH="x86_64"
[[ "$MYARCH" == "i686" ]] && ALTARCH="i386"
ROOTFS="stage4-${MYARCH}-musl-vanilla" ROOTFS="stage4-${MYARCH}-musl-vanilla"
PWD="$(pwd)" PWD="$(pwd)"
@ -18,9 +21,9 @@ prepare_etc () {
cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/ cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/
if [[ "$MYARCH" == "amd64" ]]; then 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 elif [[ "$MYARCH" == "i686" ]]; then
sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/make.conf sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf
fi fi
} }