summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch')
-rw-r--r--package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch b/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch
new file mode 100644
index 0000000000..aaf1d35374
--- /dev/null
+++ b/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch
@@ -0,0 +1,37 @@
+From 4723f3fd04edf1aad6750ca91fd4648216d8b408 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>
+Date: Sat, 21 Sep 2013 00:14:39 +0300
+Subject: [PATCH] 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>
+Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 64568dd..388899e 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)
+--
+1.8.4.rc3
+
OpenPOWER on IntegriCloud