aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-07-27 15:19:49 -0500
committerRob Landley <rob@landley.net>2014-07-27 15:19:49 -0500
commit1e1f4412d8c4ef7c0442b62ee507ca48a07ade06 (patch)
tree04e8743e289b359338e4239d46799c7a14b3853b
parentfec3fd1f8ac1db9ed87b79bd3eb5e38aa835e881 (diff)
downloadtoybox-1e1f4412d8c4ef7c0442b62ee507ca48a07ade06.tar.gz
Patch from Isaac Dunham to work around the deficiencies in musl's regex engine (which break building under alpine linux).
Musl's regex engine doesn't support \| which changes the behavior of busybox sed, breaks toybox grep... I need to come up with a musl patch, in the meantime here's a workaround.
-rwxr-xr-xscripts/single.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/single.sh b/scripts/single.sh
index e7e42edd..a07770ba 100755
--- a/scripts/single.sh
+++ b/scripts/single.sh
@@ -10,10 +10,14 @@ fi
NAME=$(echo $1 | tr a-z- A-Z_)
export KCONFIG_CONFIG=.singleconfig
+USET="is not set"
make allnoconfig > /dev/null &&
-sed -i -e "s/\(CONFIG_TOYBOX\)=y/# \1 is not set/" \
- -e "s/# CONFIG_\($NAME\|${NAME}_[^ ]*\|TOYBOX_HELP[^ ]*\|TOYBOX_I18N\|TOYBOX_FLOAT\) is not set/CONFIG_\1=y/" \
+sed -i -e "s/\(CONFIG_TOYBOX\)=y/# \1 $USET/" \
+ -e "s/# \(CONFIG_$NAME\) $USET/\1=y/" \
+ -e "s/# \(CONFIG_TOYBOX_HELP\) $USET/\1=y/" \
+ -e "s/# \(CONFIG_TOYBOX_I18N\) $USET/\1=y/" \
+ -e "s/# \(CONFIG_TOYBOX_FLOAT\) $USET/\1=y/" \
"$KCONFIG_CONFIG" &&
make &&
mv toybox $PREFIX$1