| 1 |
commit: 13c0b6fe6d8f5272f77ee5542773f56f2b48080e |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 6 13:07:10 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 6 13:07:10 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=13c0b6fe |
| 7 |
|
| 8 |
tools-musl: fix ARCH dependant paths |
| 9 |
|
| 10 |
--- |
| 11 |
tools-musl/run.sh | 21 +++++++++++++-------- |
| 12 |
1 file changed, 13 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/tools-musl/run.sh b/tools-musl/run.sh |
| 15 |
index 3874cb4..caf9491 100755 |
| 16 |
--- a/tools-musl/run.sh |
| 17 |
+++ b/tools-musl/run.sh |
| 18 |
@@ -3,38 +3,43 @@ |
| 19 |
TEST_ARCH=$(file -b /usr/lib/libc.so | sed -e 's/^.*shared object, //' -e 's/,.*$//') |
| 20 |
|
| 21 |
if [[ "${TEST_ARCH}" == "Intel 80386" ]]; then |
| 22 |
- MYARCH="i686" |
| 23 |
+ MY_ARCH="i686" |
| 24 |
ALTARCH="i386" |
| 25 |
elif [[ "${TEST_ARCH}" == "x86-64" ]]; then |
| 26 |
- MYARCH="amd64" |
| 27 |
+ MY_ARCH="amd64" |
| 28 |
ALTARCH="x86_64" |
| 29 |
else |
| 30 |
echo "Unsupported arch $TEST_ARCH" |
| 31 |
exit |
| 32 |
fi |
| 33 |
|
| 34 |
-ROOTFS="stage4-${MYARCH}-musl-vanilla" |
| 35 |
+ROOTFS="stage4-${MY_ARCH}-musl-vanilla" |
| 36 |
PWD="$(pwd)" |
| 37 |
|
| 38 |
prepare_etc () { |
| 39 |
mkdir -p "${ROOTFS}"/etc |
| 40 |
cp -a "${PWD}"/portage/ "${ROOTFS}"/etc/ |
| 41 |
|
| 42 |
- if [[ "$MYARCH" == "amd64" ]]; then |
| 43 |
+ if [[ "$MY_ARCH" == "amd64" ]]; then |
| 44 |
sed -i "s/ALTARCH/${ALTARCH}/" "${ROOTFS}"/etc/portage/make.conf |
| 45 |
- elif [[ "$MYARCH" == "i686" ]]; then |
| 46 |
- sed -i "s/ALTARCH/${MYARCH}/" "${ROOTFS}"/etc/portage/make.conf |
| 47 |
+ elif [[ "$MY_ARCH" == "i686" ]]; then |
| 48 |
+ sed -i "s/ALTARCH/${MY_ARCH}/" "${ROOTFS}"/etc/portage/make.conf |
| 49 |
fi |
| 50 |
} |
| 51 |
|
| 52 |
prepare_usr_etc() { |
| 53 |
mkdir -p "${ROOTFS}"/usr/etc |
| 54 |
|
| 55 |
+ local PATH_ARCH |
| 56 |
+ |
| 57 |
+ [[ "$MY_ARCH" == "amd64" ]] && PATH_ARCH="x86_64" |
| 58 |
+ [[ "$MY_ARCH" == "i686" ]] && PATH_ARCH="i686" |
| 59 |
+ |
| 60 |
cat <<-EOF > "${ROOTFS}"/usr/etc/ld-musl-${ALTARCH}.path |
| 61 |
/lib |
| 62 |
/usr/lib |
| 63 |
- /usr/lib/gcc/${ALTARCH}-gentoo-linux-musl/4.7.3 |
| 64 |
- /usr/${ALTARCH}-gentoo-linux-musl/lib |
| 65 |
+ /usr/lib/gcc/${PATH_ARCH}-gentoo-linux-musl/4.7.3 |
| 66 |
+ /usr/${PATH_ARCH}-gentoo-linux-musl/lib |
| 67 |
EOF |
| 68 |
|
| 69 |
ln -sf ld-musl-${ALTARCH}.path "${ROOTFS}"/usr/etc/ld-musl.path |
Archives