summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Aşıcı <fatih.asici@gmail.com>2013-09-21 00:14:39 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-11 21:03:18 +0200
commit4723f3fd04edf1aad6750ca91fd4648216d8b408 (patch)
tree0e2379eeb4331510a87014d79c088aeda949129b
parenta9bad65b091d15b0446fa141e0a69ebb94b38b70 (diff)
configure: Parse -device-option value correctly
The regular expression does not parse correctly when a device option value contains the character '=' (e.g. QMAKE_CFLAGS="-D_FILE_OFFSET_BITS=64"). In order to break string at the first equal sign and to simplify code, use "cut" command as in other places in configure script. Task-number: QTBUG-33584 Change-Id: I05b474d2ba6bff84c1e40d00475963bab36d94b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 64568dd476..388899e5e4 100755
--- a/configure
+++ b/configure
@@ -1609,8 +1609,8 @@ while [ "$#" -gt 0 ]; do
[ "$XPLATFORM" = "undefined" ] && exit 101
;;
device-option)
- DEV_VAR=`echo $VAL | sed "s,^\(.*\)=.*,\1,"`
- DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"`
+ DEV_VAR=`echo $VAL | cut -d '=' -f 1`
+ DEV_VAL=`echo $VAL | cut -d '=' -f 2-`
DeviceVar set $DEV_VAR "$DEV_VAL"
;;
qpa)