qtbase: add patch to fix build with LD exported in env
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
1965248b7b
commit
c46260790e
|
@ -0,0 +1,43 @@
|
||||||
|
From a81111b76b2890b51d645ee25267a4e6a2eaed1f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
Date: Wed, 8 May 2013 23:54:35 +0200
|
||||||
|
Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars
|
||||||
|
|
||||||
|
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
|
||||||
|
causing issues as we need g++ to be used as linker
|
||||||
|
|
||||||
|
Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
|
||||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
---
|
||||||
|
configure | 15 +--------------
|
||||||
|
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index d4131dc..fcd8ecc 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -740,20 +740,7 @@ fi'`
|
||||||
|
done
|
||||||
|
|
||||||
|
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||||
|
-for varname in $SYSTEM_VARIABLES; do
|
||||||
|
- qmakevarname="${varname}"
|
||||||
|
- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
|
||||||
|
- if [ "${varname}" = "LDFLAGS" ]; then
|
||||||
|
- qmakevarname="LFLAGS"
|
||||||
|
- elif [ "${varname}" = "LD" ]; then
|
||||||
|
- qmakevarname="LINK"
|
||||||
|
- fi
|
||||||
|
- cmd=`echo \
|
||||||
|
-'if [ -n "\$'${varname}'" ]; then
|
||||||
|
- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
|
||||||
|
-fi'`
|
||||||
|
- eval "$cmd"
|
||||||
|
-done
|
||||||
|
+
|
||||||
|
# Use CC/CXX to run config.tests
|
||||||
|
mkdir -p "$outpath/config.tests"
|
||||||
|
rm -f "$outpath/config.tests/.qmake.cache"
|
||||||
|
--
|
||||||
|
1.8.2.1
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
From afb5a8d45bd7c816eed959c08b05bbcd86814503 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
Date: Wed, 8 May 2013 23:54:35 +0200
|
||||||
|
Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars
|
||||||
|
|
||||||
|
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
|
||||||
|
causing issues as we need g++ to be used as linker
|
||||||
|
|
||||||
|
Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
|
||||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
---
|
||||||
|
configure | 15 +--------------
|
||||||
|
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 866e535..620ffd6 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -840,20 +840,7 @@ fi'`
|
||||||
|
done
|
||||||
|
|
||||||
|
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||||
|
-for varname in $SYSTEM_VARIABLES; do
|
||||||
|
- qmakevarname="${varname}"
|
||||||
|
- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
|
||||||
|
- if [ "${varname}" = "LDFLAGS" ]; then
|
||||||
|
- qmakevarname="LFLAGS"
|
||||||
|
- elif [ "${varname}" = "LD" ]; then
|
||||||
|
- qmakevarname="LINK"
|
||||||
|
- fi
|
||||||
|
- cmd=`echo \
|
||||||
|
-'if [ -n "\$'${varname}'" ]; then
|
||||||
|
- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
|
||||||
|
-fi'`
|
||||||
|
- eval "$cmd"
|
||||||
|
-done
|
||||||
|
+
|
||||||
|
# Use CC/CXX to run config.tests
|
||||||
|
mkdir -p "$outpath/config.tests"
|
||||||
|
rm -f "$outpath/config.tests/.qmake.cache"
|
||||||
|
--
|
||||||
|
1.8.2.1
|
||||||
|
|
|
@ -20,6 +20,7 @@ SRC_URI += " \
|
||||||
file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
|
file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
|
||||||
file://0011-qt_module-Fix-paths-in-.prl-files.patch \
|
file://0011-qt_module-Fix-paths-in-.prl-files.patch \
|
||||||
file://0012-wayland-scanner-disable-silent-rules.patch \
|
file://0012-wayland-scanner-disable-silent-rules.patch \
|
||||||
|
file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
# specific for native version
|
# specific for native version
|
||||||
|
|
|
@ -12,6 +12,7 @@ SRC_URI += " \
|
||||||
file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
|
file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
|
||||||
file://0011-qt_module-Fix-paths-in-.prl-files.patch \
|
file://0011-qt_module-Fix-paths-in-.prl-files.patch \
|
||||||
file://0012-wayland-scanner-disable-silent-rules.patch \
|
file://0012-wayland-scanner-disable-silent-rules.patch \
|
||||||
|
file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev"
|
DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev"
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
From ec6de65fc787c8a5e782b48b6794646f274da43a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
Date: Wed, 8 May 2013 23:54:35 +0200
|
||||||
|
Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars
|
||||||
|
|
||||||
|
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
|
||||||
|
causing issues as we need g++ to be used as linker
|
||||||
|
|
||||||
|
Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e
|
||||||
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||||||
|
---
|
||||||
|
configure | 15 +--------------
|
||||||
|
1 file changed, 1 insertion(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index feb1435..6d3d1e2 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -740,20 +740,7 @@ fi'`
|
||||||
|
done
|
||||||
|
|
||||||
|
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
|
||||||
|
-for varname in $SYSTEM_VARIABLES; do
|
||||||
|
- qmakevarname="${varname}"
|
||||||
|
- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
|
||||||
|
- if [ "${varname}" = "LDFLAGS" ]; then
|
||||||
|
- qmakevarname="LFLAGS"
|
||||||
|
- elif [ "${varname}" = "LD" ]; then
|
||||||
|
- qmakevarname="LINK"
|
||||||
|
- fi
|
||||||
|
- cmd=`echo \
|
||||||
|
-'if [ -n "\$'${varname}'" ]; then
|
||||||
|
- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
|
||||||
|
-fi'`
|
||||||
|
- eval "$cmd"
|
||||||
|
-done
|
||||||
|
+
|
||||||
|
# Use CC/CXX to run config.tests
|
||||||
|
mkdir -p "$outpath/config.tests"
|
||||||
|
rm -f "$outpath/config.tests/.qmake.cache"
|
||||||
|
--
|
||||||
|
1.8.2.1
|
||||||
|
|
Loading…
Reference in New Issue