[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [android-qt/unstable] /: Fix sed transform (qmake.conf to shell scipt) for QMAKE_CXX variable
From:       Ray Donnelly <mingw.android () laptop ! com>
Date:       2012-08-01 1:18:08
Message-ID: 20120801011808.EFE67A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 7753a910ebf171e98f73fcf4162fbf163a83c50e by Ray Donnelly.
Committed on 01/08/2012 at 03:16.
Pushed by rdonnelly into branch 'unstable'.

Fix sed transform (qmake.conf to shell scipt) for QMAKE_CXX variable

M  +3    -1    configure

http://commits.kde.org/android-qt/7753a910ebf171e98f73fcf4162fbf163a83c50e

diff --git a/configure b/configure
index 5b4cf01..cfa076a 100755
--- a/configure
+++ b/configure
@@ -3455,7 +3455,9 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
     # Repeat what mkspecs for android does. This is horrible, but I can't see a way \
                around it given what getQMakeConf does.
     NDK_TOOLCHAIN_PATH=$ANDROID_NDK_ROOT/toolchains/$ANDROID_NDK_TOOLCHAIN_PREFIX-$ANDROID_NDK_TOOLCHAIN_VERSION/prebuilt/$ANDROID_NDK_HOST
  NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi
-    QMAKE_CONF_COMPILER=$(echo "$QMAKE_CONF_COMPILER" | sed 's:\$\$:\$:g')
+    # Replace all occourances of $$(EXAMPLE_VARIABLE) from qmake.conf with \
${EXAMPLE_VARIABLE} +    #  so we can eval it from shell script.
+    QMAKE_CONF_COMPILER=$(echo "$QMAKE_CONF_COMPILER" | sed \
's:\$\$(\([a-zA-Z_]*\)):\${\1}:g')  
     eval QMAKE_CONF_COMPILER=$QMAKE_CONF_COMPILER
     TEST_COMPILER="$QMAKE_CONF_COMPILER \
--sysroot=$ANDROID_NDK_ROOT/platforms/android-5/arch-arm/"


[prev in list] [next in list] [prev in thread] [next in thread]