diff options
Diffstat (limited to 'strata/build-essential-musl')
| -rw-r--r-- | strata/build-essential-musl/musl.morph | 3 | ||||
| -rw-r--r-- | strata/build-essential-musl/stage2-musl.morph | 1 | ||||
| -rw-r--r-- | strata/build-essential-musl/zlib.morph | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/strata/build-essential-musl/musl.morph b/strata/build-essential-musl/musl.morph index cb52ac16..b6e11f90 100644 --- a/strata/build-essential-musl/musl.morph +++ b/strata/build-essential-musl/musl.morph @@ -6,4 +6,5 @@ build-commands: - make install-commands: - make install -- install -d "$DESTDIR/etc" ; echo "/lib:/lib64:/usr/lib:/usr/lib64" >> "$DESTDIR/etc/ld-musl-$MORPH_ARCH.path" +- install -d "$DESTDIR$PREFIX/bin" ; cd "$DESTDIR$PREFIX/bin" ; ln -s ../../lib/ld-musl* ldd +- install -d "$DESTDIR/etc" ; echo "/lib:/lib64:/usr/lib64:/usr/lib" >> "$DESTDIR/etc/ld-musl-$MORPH_ARCH.path" diff --git a/strata/build-essential-musl/stage2-musl.morph b/strata/build-essential-musl/stage2-musl.morph index cd84f3b0..f1850995 100644 --- a/strata/build-essential-musl/stage2-musl.morph +++ b/strata/build-essential-musl/stage2-musl.morph @@ -43,5 +43,6 @@ install-commands: "$DESTDIR/lib64/ld64.so.1" ;; *) loader=$(basename $(ls "$DESTDIR$PREFIX"/lib/ld-musl*)) + [ -z $loader ] && ( echo "Bug in stage2-musl ld.so symlinks" ; exit 1 ) ln -s "$PREFIX/lib/$loader" "$DESTDIR/lib/$loader" esac diff --git a/strata/build-essential-musl/zlib.morph b/strata/build-essential-musl/zlib.morph deleted file mode 100644 index a69eebf3..00000000 --- a/strata/build-essential-musl/zlib.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: zlib -kind: chunk -max-jobs: 1 -configure-commands: -- ./configure --prefix="$PREFIX" -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install |