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

tools-musl: fix ARCH dependant paths

Browse source
This commit is contained in:
Anthony G. Basile 2014-02-06 08:07:10 -05:00
parent ce2b5f8da8
commit 13c0b6fe6d
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools-musl/run.sh
View file

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