tools-musl: fix when portage_confdir is missing.
This commit is contained in:
parent
124152fc5c
commit
7639bead24
|
@ -38,6 +38,10 @@ prepare_confs() {
|
|||
echo "cflags: -O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" >> \
|
||||
stage${s}-${arch}-musl-${flavor}.conf
|
||||
|
||||
portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
|
||||
| sed -e 's/^.*://')
|
||||
[[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
|
||||
stage${s}-${arch}-musl-${flavor}.conf
|
||||
done
|
||||
|
||||
sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
|
||||
|
|
|
@ -27,6 +27,11 @@ prepare_confs() {
|
|||
-e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
|
||||
-e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
|
||||
> stage${s}-${arch}-musl-${flavor}.conf
|
||||
|
||||
portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
|
||||
| sed -e 's/^.*://')
|
||||
[[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
|
||||
stage${s}-${arch}-musl-${flavor}.conf
|
||||
done
|
||||
|
||||
sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
|
||||
|
|
|
@ -27,6 +27,11 @@ prepare_confs() {
|
|||
-e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
|
||||
-e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \
|
||||
> stage${s}-${arch}-musl-${flavor}.conf
|
||||
|
||||
portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
|
||||
| sed -e 's/^.*://')
|
||||
[[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
|
||||
stage${s}-${arch}-musl-${flavor}.conf
|
||||
done
|
||||
|
||||
sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
|
||||
|
|
|
@ -27,6 +27,11 @@ prepare_confs() {
|
|||
-e "s:FLAVOR:${flavor}:g" \
|
||||
-e "s:MYCATALYST:$(pwd):g" \
|
||||
> stage${s}-${arch}-musl-${flavor}.conf
|
||||
|
||||
portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
|
||||
| sed -e 's/^.*://')
|
||||
[[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
|
||||
stage${s}-${arch}-musl-${flavor}.conf
|
||||
done
|
||||
|
||||
sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
|
||||
|
|
|
@ -29,6 +29,11 @@ prepare_confs() {
|
|||
-e "s:FLAVOR:${flavor}:g" \
|
||||
-e "s:MYCATALYST:$(pwd):g" \
|
||||
> stage${s}-${arch}-musl-${flavor}.conf
|
||||
|
||||
portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \
|
||||
| sed -e 's/^.*://')
|
||||
[[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \
|
||||
stage${s}-${arch}-musl-${flavor}.conf
|
||||
done
|
||||
|
||||
sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf
|
||||
|
|
|
@ -9,4 +9,4 @@ chost: TARCH-gentoo-linux-musl
|
|||
cflags: -O2 -pipe -fomit-frame-pointer
|
||||
cxxflags: -O2 -pipe -fomit-frame-pointer
|
||||
portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
|
||||
portage_overlay: /var/lib/layman/hardened-development-musl
|
||||
portage_overlay: /var/lib/layman/musl
|
||||
|
|
Loading…
Reference in a new issue