commit 59466c4a6e90c7bed413494b52a23179d541b6dc parent 2de4124aff6dc145b1e813b03d5d7dec7ad703db Author: sin <sin@2f30.org> Date: Thu, 26 Sep 2013 20:29:52 +0100 Use /opt/cross instead of /devel Diffstat:
| M | pkgs/crossmusl | | | 10 | +++------- |
| M | prepare-root | | | 4 | ++-- |
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pkgs/crossmusl b/pkgs/crossmusl @@ -5,16 +5,12 @@ fetch() { } install() { - tar xJf src/crossx86-x86_64-linux-musl-0.9.11.tar.xz -C $root/devel - mv $root/devel/x86_64-linux-musl/x86_64-linux-musl/lib64/* $root/devel/x86_64-linux-musl/x86_64-linux-musl/lib - sed -i 's/libdir=.*//g' $root/devel/x86_64-linux-musl/x86_64-linux-musl/lib/libstdc++.la - sed -i 's/libdir=.*//g' $root/devel/x86_64-linux-musl/x86_64-linux-musl/lib/libsupc++.la - echo "libdir='/devel/x86_64-linux-musl/x86_64-linux-musl/lib'" >> $root/devel/x86_64-linux-musl/x86_64-linux-musl/lib/libstdc++.la - echo "libdir='/devel/x86_64-linux-musl/x86_64-linux-musl/lib'" >> $root/devel/x86_64-linux-musl/x86_64-linux-musl/lib/libsupc++.la + tar xJf src/crossx86-x86_64-linux-musl-0.9.11.tar.xz -C $root/opt/cross + mv $root/opt/cross/x86_64-linux-musl/x86_64-linux-musl/lib64/* $root/opt/cross/x86_64-linux-musl/x86_64-linux-musl/lib pushd $root/bin targets="ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip" for t in $targets; do - ln -sf /devel/x86_64-linux-musl/bin/x86_64-linux-musl-$t $t + ln -sf /opt/cross/x86_64-linux-musl/bin/x86_64-linux-musl-$t $t done ln -sf gcc cc popd diff --git a/prepare-root b/prepare-root @@ -1,7 +1,7 @@ mkdir -p $root cd $root -mkdir -p boot bin dev devel etc home proc root share sys tmp var -mkdir -p share/doc share/man var/empty var/log var/run +mkdir -p boot bin dev etc home opt proc root share sys tmp var +mkdir -p opt/cross share/doc share/man var/empty var/log var/run ln -sf . usr ln -sf bin sbin ln -sf ../tmp var/tmp