summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2007-01-17 13:22:50 -0500
committerunknown <cmiller@zippy.cornsilk.net>2007-01-17 13:22:50 -0500
commit63cb7acee22997ae19c169979316791f5777ba7d (patch)
treefdfddcd88716173ea48466de687c62c4c0309c38
parent0f462179dba195519661d91e49b76d65cb1ba618 (diff)
downloadmariadb-git-63cb7acee22997ae19c169979316791f5777ba7d.tar.gz
Bug#23721: compile fails: check-cpu mishandles cpu flags with \
hyphen in it (like ds-cpl). convert illegal chars in cpu flags to '_' for variable assignment BUILD/check-cpu: convert illegal chars in cpu flags to '_' for variable assignment
-rwxr-xr-xBUILD/check-cpu2
-rw-r--r--BitKeeper/etc/collapsed1
2 files changed, 2 insertions, 1 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu
index e207d12d972..5d8c9ef2df4 100755
--- a/BUILD/check-cpu
+++ b/BUILD/check-cpu
@@ -28,7 +28,7 @@ check_cpu () {
fi
# parse CPU flags
- for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do
+ for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do
eval cpu_flag_$flag=yes
done
else
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 3b45bb4f30c..457d909ef74 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -3,3 +3,4 @@
454f8960jsVT_kMKJtZ9OCgXoba0xQ
4554a95d7txO1DuO9G3nAizI3SkFAA
4554b3722d71SbPiI2Gx-RhbZjmuIQ
+45ae6628gqKTsUFfnoNExadETVIkbA