* [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it
@ 2015-11-26 8:06 Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec Andreas Müller
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Andreas Müller @ 2015-11-26 8:06 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
recipes-qt/qt5/qt5-creator_3.5.1.bb | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb
index 4bb0998..2d8cee9 100644
--- a/recipes-qt/qt5/qt5-creator_3.5.1.bb
+++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb
@@ -30,12 +30,6 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
-do_configure_prepend() {
- # causes gcc infinite loop with 4.9.x for arm targets similar to
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61033
- export DO_NOT_BUILD_QMLDESIGNER=1
-}
-
do_configure_append() {
# Find native tools
sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile
@@ -67,6 +61,7 @@ FILES_${PN} += " \
FILES_${PN}-dbg += " \
${libdir}${QT_DIR_NAME}/qtcreator/.debug \
${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \
+ ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \
${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \
"
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec
2015-11-26 8:06 [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
@ 2015-11-26 8:06 ` Andreas Müller
2015-12-15 11:32 ` Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][master 2/2] " Andreas Müller
2015-12-15 11:32 ` [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
2 siblings, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2015-11-26 8:06 UTC (permalink / raw)
To: openembedded-devel
With this we can setup qt-creator to build/debug on target again.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
recipes-qt/qt5/qtbase_git.bb | 1 +
2 files changed, 77 insertions(+)
create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
new file mode 100644
index 0000000..efd27a5
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
@@ -0,0 +1,76 @@
+From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 13 Nov 2015 12:36:11 +0100
+Subject: [PATCH] configure paths/mkspecs for target qmake properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+to use this patch in all qtbase/qtbase-native(sdk) changes ore made
+conditionally based on QT_CROSS_COMPILE
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 6edfffd..de74a29 100755
+--- a/configure
++++ b/configure
+@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
+ fi
+
+-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
+-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++ shortxspec=linux-g++
++ shortspec=linux-g++
++else
++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++fi
+
+ QT_CONFIGURE_STR_OFF=0
+
+@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
+
+ QT_CONFIGURE_STR_OFFSETS=
+ QT_CONFIGURE_STRS=
+-addConfStr "$CFG_SYSROOT"
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++ addConfStr ""
++else
++ addConfStr "$CFG_SYSROOT"
++fi
+ addConfStr "$QT_REL_HOST_BINS"
+ addConfStr "$QT_REL_HOST_LIBS"
+ addConfStr "$QT_REL_HOST_DATA"
+@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
+ #-------------------------------------------------------------------------------
+ [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
+
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
++else
++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
++fi
++
+ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+ /* License Info */
+ static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
+@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
+ static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
+ #ifdef QT_BUILD_QMAKE
+ static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
+-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
+ #endif
+
+ static const short qt_configure_str_offsets[] = {
+--
+2.1.0
+
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 0ba8ac8..3ef5923 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,6 +26,7 @@ SRC_URI += "\
file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
+ file://0011-configure-paths-for-target-qmake-properly.patch \
"
DEPENDS += "qtbase-native"
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH][meta-qt5][master 2/2] align target qmake paths/mkspec
2015-11-26 8:06 [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec Andreas Müller
@ 2015-11-26 8:06 ` Andreas Müller
2015-12-15 11:32 ` Andreas Müller
2015-12-15 11:32 ` [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
2 siblings, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2015-11-26 8:06 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 +-
recipes-qt/qt5/qtbase-native_git.bb | 5 +-
...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
...build-uic.patch => 0009-Always-build-uic.patch} | 0
...xternal-hostbindir-option-for-native-sdk.patch} | 0
recipes-qt/qt5/qtbase_git.bb | 1 +
6 files changed, 82 insertions(+), 4 deletions(-)
create mode 100644 recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
rename recipes-qt/qt5/qtbase/{0008-Always-build-uic.patch => 0009-Always-build-uic.patch} (100%)
rename recipes-qt/qt5/qtbase/{0009-Add-external-hostbindir-option-for-native-sdk.patch => 0010-Add-external-hostbindir-option-for-native-sdk.patch} (100%)
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f712af7..3d4900e 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -33,8 +33,8 @@ SRC_URI += "\
# common for qtbase-native and nativesdk-qtbase
SRC_URI += " \
- file://0008-Always-build-uic.patch \
- file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
+ file://0009-Always-build-uic.patch \
+ file://0010-Add-external-hostbindir-option-for-native-sdk.patch \
"
# CMake's toolchain configuration of nativesdk-qtbase
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index e27d34b..14e8516 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -23,12 +23,13 @@ SRC_URI += "\
file://0005-configure-bump-path-length-from-256-to-512-character.patch \
file://0006-QOpenGLPaintDevice-sub-area-support.patch \
file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
+ file://0008-configure-paths-for-target-qmake-properly.patch \
"
# common for qtbase-native and nativesdk-qtbase
SRC_URI += " \
- file://0008-Always-build-uic.patch \
- file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
+ file://0009-Always-build-uic.patch \
+ file://0010-Add-external-hostbindir-option-for-native-sdk.patch \
"
CLEANBROKEN = "1"
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
new file mode 100644
index 0000000..efd27a5
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
@@ -0,0 +1,76 @@
+From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 13 Nov 2015 12:36:11 +0100
+Subject: [PATCH] configure paths/mkspecs for target qmake properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+to use this patch in all qtbase/qtbase-native(sdk) changes ore made
+conditionally based on QT_CROSS_COMPILE
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 6edfffd..de74a29 100755
+--- a/configure
++++ b/configure
+@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
+ fi
+
+-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
+-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++ shortxspec=linux-g++
++ shortspec=linux-g++
++else
++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
++fi
+
+ QT_CONFIGURE_STR_OFF=0
+
+@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
+
+ QT_CONFIGURE_STR_OFFSETS=
+ QT_CONFIGURE_STRS=
+-addConfStr "$CFG_SYSROOT"
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++ addConfStr ""
++else
++ addConfStr "$CFG_SYSROOT"
++fi
+ addConfStr "$QT_REL_HOST_BINS"
+ addConfStr "$QT_REL_HOST_LIBS"
+ addConfStr "$QT_REL_HOST_DATA"
+@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
+ #-------------------------------------------------------------------------------
+ [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
+
++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
++else
++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
++fi
++
+ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
+ /* License Info */
+ static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
+@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
+ static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
+ #ifdef QT_BUILD_QMAKE
+ static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
+-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
+ #endif
+
+ static const short qt_configure_str_offsets[] = {
+--
+2.1.0
+
diff --git a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
similarity index 100%
rename from recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
diff --git a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
similarity index 100%
rename from recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
rename to recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index fdc73e1..20627c8 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -19,6 +19,7 @@ SRC_URI += "\
file://0005-configure-bump-path-length-from-256-to-512-character.patch \
file://0006-QOpenGLPaintDevice-sub-area-support.patch \
file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
+ file://0008-configure-paths-for-target-qmake-properly.patch \
"
DEPENDS += "qtbase-native"
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it
2015-11-26 8:06 [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][master 2/2] " Andreas Müller
@ 2015-12-15 11:32 ` Andreas Müller
2 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2015-12-15 11:32 UTC (permalink / raw)
To: openembedded-devel
On Thu, Nov 26, 2015 at 9:06 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> recipes-qt/qt5/qt5-creator_3.5.1.bb | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bb b/recipes-qt/qt5/qt5-creator_3.5.1.bb
> index 4bb0998..2d8cee9 100644
> --- a/recipes-qt/qt5/qt5-creator_3.5.1.bb
> +++ b/recipes-qt/qt5/qt5-creator_3.5.1.bb
> @@ -30,12 +30,6 @@ S = "${WORKDIR}/qt-creator-opensource-src-${PV}"
>
> EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
>
> -do_configure_prepend() {
> - # causes gcc infinite loop with 4.9.x for arm targets similar to
> - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61033
> - export DO_NOT_BUILD_QMLDESIGNER=1
> -}
> -
> do_configure_append() {
> # Find native tools
> sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile
> @@ -67,6 +61,7 @@ FILES_${PN} += " \
> FILES_${PN}-dbg += " \
> ${libdir}${QT_DIR_NAME}/qtcreator/.debug \
> ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \
> + ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \
> ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \
> "
>
> --
> 2.1.0
>
Ping
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec
2015-11-26 8:06 ` [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec Andreas Müller
@ 2015-12-15 11:32 ` Andreas Müller
2015-12-22 16:14 ` Andreas Müller
0 siblings, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2015-12-15 11:32 UTC (permalink / raw)
To: openembedded-devel
On Thu, Nov 26, 2015 at 9:06 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> With this we can setup qt-creator to build/debug on target again.
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> ...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
> recipes-qt/qt5/qtbase_git.bb | 1 +
> 2 files changed, 77 insertions(+)
> create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>
> diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> new file mode 100644
> index 0000000..efd27a5
> --- /dev/null
> +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> @@ -0,0 +1,76 @@
> +From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Fri, 13 Nov 2015 12:36:11 +0100
> +Subject: [PATCH] configure paths/mkspecs for target qmake properly
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +to use this patch in all qtbase/qtbase-native(sdk) changes ore made
> +conditionally based on QT_CROSS_COMPILE
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + configure | 23 +++++++++++++++++++----
> + 1 file changed, 19 insertions(+), 4 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 6edfffd..de74a29 100755
> +--- a/configure
> ++++ b/configure
> +@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
> + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
> + fi
> +
> +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> ++ shortxspec=linux-g++
> ++ shortspec=linux-g++
> ++else
> ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> ++fi
> +
> + QT_CONFIGURE_STR_OFF=0
> +
> +@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
> +
> + QT_CONFIGURE_STR_OFFSETS=
> + QT_CONFIGURE_STRS=
> +-addConfStr "$CFG_SYSROOT"
> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> ++ addConfStr ""
> ++else
> ++ addConfStr "$CFG_SYSROOT"
> ++fi
> + addConfStr "$QT_REL_HOST_BINS"
> + addConfStr "$QT_REL_HOST_LIBS"
> + addConfStr "$QT_REL_HOST_DATA"
> +@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
> + #-------------------------------------------------------------------------------
> + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
> +
> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
> ++else
> ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
> ++fi
> ++
> + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
> + /* License Info */
> + static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
> +@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
> + static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> + #ifdef QT_BUILD_QMAKE
> + static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> +-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> ++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
> + #endif
> +
> + static const short qt_configure_str_offsets[] = {
> +--
> +2.1.0
> +
> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> index 0ba8ac8..3ef5923 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -26,6 +26,7 @@ SRC_URI += "\
> file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
> file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
> file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
> + file://0011-configure-paths-for-target-qmake-properly.patch \
> "
>
> DEPENDS += "qtbase-native"
> --
> 2.1.0
>
Ping
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-qt5][master 2/2] align target qmake paths/mkspec
2015-11-26 8:06 ` [PATCH][meta-qt5][master 2/2] " Andreas Müller
@ 2015-12-15 11:32 ` Andreas Müller
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2015-12-15 11:32 UTC (permalink / raw)
To: openembedded-devel
On Thu, Nov 26, 2015 at 9:06 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> recipes-qt/qt5/nativesdk-qtbase_git.bb | 4 +-
> recipes-qt/qt5/qtbase-native_git.bb | 5 +-
> ...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
> ...build-uic.patch => 0009-Always-build-uic.patch} | 0
> ...xternal-hostbindir-option-for-native-sdk.patch} | 0
> recipes-qt/qt5/qtbase_git.bb | 1 +
> 6 files changed, 82 insertions(+), 4 deletions(-)
> create mode 100644 recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
> rename recipes-qt/qt5/qtbase/{0008-Always-build-uic.patch => 0009-Always-build-uic.patch} (100%)
> rename recipes-qt/qt5/qtbase/{0009-Add-external-hostbindir-option-for-native-sdk.patch => 0010-Add-external-hostbindir-option-for-native-sdk.patch} (100%)
>
> diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
> index f712af7..3d4900e 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
> +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
> @@ -33,8 +33,8 @@ SRC_URI += "\
>
> # common for qtbase-native and nativesdk-qtbase
> SRC_URI += " \
> - file://0008-Always-build-uic.patch \
> - file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
> + file://0009-Always-build-uic.patch \
> + file://0010-Add-external-hostbindir-option-for-native-sdk.patch \
> "
>
> # CMake's toolchain configuration of nativesdk-qtbase
> diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
> index e27d34b..14e8516 100644
> --- a/recipes-qt/qt5/qtbase-native_git.bb
> +++ b/recipes-qt/qt5/qtbase-native_git.bb
> @@ -23,12 +23,13 @@ SRC_URI += "\
> file://0005-configure-bump-path-length-from-256-to-512-character.patch \
> file://0006-QOpenGLPaintDevice-sub-area-support.patch \
> file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
> + file://0008-configure-paths-for-target-qmake-properly.patch \
> "
>
> # common for qtbase-native and nativesdk-qtbase
> SRC_URI += " \
> - file://0008-Always-build-uic.patch \
> - file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
> + file://0009-Always-build-uic.patch \
> + file://0010-Add-external-hostbindir-option-for-native-sdk.patch \
> "
>
> CLEANBROKEN = "1"
> diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
> new file mode 100644
> index 0000000..efd27a5
> --- /dev/null
> +++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
> @@ -0,0 +1,76 @@
> +From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Fri, 13 Nov 2015 12:36:11 +0100
> +Subject: [PATCH] configure paths/mkspecs for target qmake properly
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +to use this patch in all qtbase/qtbase-native(sdk) changes ore made
> +conditionally based on QT_CROSS_COMPILE
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + configure | 23 +++++++++++++++++++----
> + 1 file changed, 19 insertions(+), 4 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 6edfffd..de74a29 100755
> +--- a/configure
> ++++ b/configure
> +@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
> + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
> + fi
> +
> +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> ++ shortxspec=linux-g++
> ++ shortspec=linux-g++
> ++else
> ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> ++fi
> +
> + QT_CONFIGURE_STR_OFF=0
> +
> +@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
> +
> + QT_CONFIGURE_STR_OFFSETS=
> + QT_CONFIGURE_STRS=
> +-addConfStr "$CFG_SYSROOT"
> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> ++ addConfStr ""
> ++else
> ++ addConfStr "$CFG_SYSROOT"
> ++fi
> + addConfStr "$QT_REL_HOST_BINS"
> + addConfStr "$QT_REL_HOST_LIBS"
> + addConfStr "$QT_REL_HOST_DATA"
> +@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
> + #-------------------------------------------------------------------------------
> + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
> +
> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
> ++else
> ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
> ++fi
> ++
> + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
> + /* License Info */
> + static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
> +@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
> + static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> + #ifdef QT_BUILD_QMAKE
> + static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> +-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> ++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
> + #endif
> +
> + static const short qt_configure_str_offsets[] = {
> +--
> +2.1.0
> +
> diff --git a/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
> similarity index 100%
> rename from recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
> rename to recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
> diff --git a/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
> similarity index 100%
> rename from recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
> rename to recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> index fdc73e1..20627c8 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -19,6 +19,7 @@ SRC_URI += "\
> file://0005-configure-bump-path-length-from-256-to-512-character.patch \
> file://0006-QOpenGLPaintDevice-sub-area-support.patch \
> file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
> + file://0008-configure-paths-for-target-qmake-properly.patch \
> "
>
> DEPENDS += "qtbase-native"
> --
> 2.1.0
>
Ping
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec
2015-12-15 11:32 ` Andreas Müller
@ 2015-12-22 16:14 ` Andreas Müller
2015-12-22 16:40 ` Martin Jansa
0 siblings, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2015-12-22 16:14 UTC (permalink / raw)
To: openembedded-devel
On Tue, Dec 15, 2015 at 12:32 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Thu, Nov 26, 2015 at 9:06 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> With this we can setup qt-creator to build/debug on target again.
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>> ...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
>> recipes-qt/qt5/qtbase_git.bb | 1 +
>> 2 files changed, 77 insertions(+)
>> create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>>
>> diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>> new file mode 100644
>> index 0000000..efd27a5
>> --- /dev/null
>> +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>> @@ -0,0 +1,76 @@
>> +From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>> +Date: Fri, 13 Nov 2015 12:36:11 +0100
>> +Subject: [PATCH] configure paths/mkspecs for target qmake properly
>> +MIME-Version: 1.0
>> +Content-Type: text/plain; charset=UTF-8
>> +Content-Transfer-Encoding: 8bit
>> +
>> +to use this patch in all qtbase/qtbase-native(sdk) changes ore made
>> +conditionally based on QT_CROSS_COMPILE
>> +
>> +Upstream-Status: Inappropriate [OE specific]
>> +
>> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> +---
>> + configure | 23 +++++++++++++++++++----
>> + 1 file changed, 19 insertions(+), 4 deletions(-)
>> +
>> +diff --git a/configure b/configure
>> +index 6edfffd..de74a29 100755
>> +--- a/configure
>> ++++ b/configure
>> +@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
>> + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
>> + fi
>> +
>> +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
>> ++ shortxspec=linux-g++
>> ++ shortspec=linux-g++
>> ++else
>> ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> ++fi
>> +
>> + QT_CONFIGURE_STR_OFF=0
>> +
>> +@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
>> +
>> + QT_CONFIGURE_STR_OFFSETS=
>> + QT_CONFIGURE_STRS=
>> +-addConfStr "$CFG_SYSROOT"
>> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
>> ++ addConfStr ""
>> ++else
>> ++ addConfStr "$CFG_SYSROOT"
>> ++fi
>> + addConfStr "$QT_REL_HOST_BINS"
>> + addConfStr "$QT_REL_HOST_LIBS"
>> + addConfStr "$QT_REL_HOST_DATA"
>> +@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
>> + #-------------------------------------------------------------------------------
>> + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
>> +
>> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
>> ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
>> ++else
>> ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
>> ++fi
>> ++
>> + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
>> + /* License Info */
>> + static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
>> +@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
>> + static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
>> + #ifdef QT_BUILD_QMAKE
>> + static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
>> +-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
>> ++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
>> + #endif
>> +
>> + static const short qt_configure_str_offsets[] = {
>> +--
>> +2.1.0
>> +
>> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
>> index 0ba8ac8..3ef5923 100644
>> --- a/recipes-qt/qt5/qtbase_git.bb
>> +++ b/recipes-qt/qt5/qtbase_git.bb
>> @@ -26,6 +26,7 @@ SRC_URI += "\
>> file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
>> file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
>> file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
>> + file://0011-configure-paths-for-target-qmake-properly.patch \
>> "
>>
>> DEPENDS += "qtbase-native"
>> --
>> 2.1.0
>>
> Ping
Ping for jethro
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec
2015-12-22 16:14 ` Andreas Müller
@ 2015-12-22 16:40 ` Martin Jansa
2015-12-22 16:44 ` Andreas Müller
0 siblings, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2015-12-22 16:40 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 5339 bytes --]
On Tue, Dec 22, 2015 at 05:14:23PM +0100, Andreas Müller wrote:
> On Tue, Dec 15, 2015 at 12:32 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Thu, Nov 26, 2015 at 9:06 AM, Andreas Müller
> > <schnitzeltony@googlemail.com> wrote:
> >> With this we can setup qt-creator to build/debug on target again.
> >>
> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> ---
> >> ...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
> >> recipes-qt/qt5/qtbase_git.bb | 1 +
> >> 2 files changed, 77 insertions(+)
> >> create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> >>
> >> diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> >> new file mode 100644
> >> index 0000000..efd27a5
> >> --- /dev/null
> >> +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> >> @@ -0,0 +1,76 @@
> >> +From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
> >> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> >> +Date: Fri, 13 Nov 2015 12:36:11 +0100
> >> +Subject: [PATCH] configure paths/mkspecs for target qmake properly
> >> +MIME-Version: 1.0
> >> +Content-Type: text/plain; charset=UTF-8
> >> +Content-Transfer-Encoding: 8bit
> >> +
> >> +to use this patch in all qtbase/qtbase-native(sdk) changes ore made
> >> +conditionally based on QT_CROSS_COMPILE
> >> +
> >> +Upstream-Status: Inappropriate [OE specific]
> >> +
> >> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >> +---
> >> + configure | 23 +++++++++++++++++++----
> >> + 1 file changed, 19 insertions(+), 4 deletions(-)
> >> +
> >> +diff --git a/configure b/configure
> >> +index 6edfffd..de74a29 100755
> >> +--- a/configure
> >> ++++ b/configure
> >> +@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
> >> + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
> >> + fi
> >> +
> >> +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> >> +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> >> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> >> ++ shortxspec=linux-g++
> >> ++ shortspec=linux-g++
> >> ++else
> >> ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> >> ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
> >> ++fi
> >> +
> >> + QT_CONFIGURE_STR_OFF=0
> >> +
> >> +@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
> >> +
> >> + QT_CONFIGURE_STR_OFFSETS=
> >> + QT_CONFIGURE_STRS=
> >> +-addConfStr "$CFG_SYSROOT"
> >> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> >> ++ addConfStr ""
> >> ++else
> >> ++ addConfStr "$CFG_SYSROOT"
> >> ++fi
> >> + addConfStr "$QT_REL_HOST_BINS"
> >> + addConfStr "$QT_REL_HOST_LIBS"
> >> + addConfStr "$QT_REL_HOST_DATA"
> >> +@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
> >> + #-------------------------------------------------------------------------------
> >> + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
> >> +
> >> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
> >> ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
> >> ++else
> >> ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
> >> ++fi
> >> ++
> >> + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
> >> + /* License Info */
> >> + static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
> >> +@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
> >> + static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> >> + #ifdef QT_BUILD_QMAKE
> >> + static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> >> +-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> >> ++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
> >> + #endif
> >> +
> >> + static const short qt_configure_str_offsets[] = {
> >> +--
> >> +2.1.0
> >> +
> >> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> >> index 0ba8ac8..3ef5923 100644
> >> --- a/recipes-qt/qt5/qtbase_git.bb
> >> +++ b/recipes-qt/qt5/qtbase_git.bb
> >> @@ -26,6 +26,7 @@ SRC_URI += "\
> >> file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
> >> file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
> >> file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
> >> + file://0011-configure-paths-for-target-qmake-properly.patch \
> >> "
> >>
> >> DEPENDS += "qtbase-native"
> >> --
> >> 2.1.0
> >>
> > Ping
> Ping for jethro
I wanted to keep it a bit longer in master, but I trust you, so pushed
to jethro as well.
Thanks
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec
2015-12-22 16:40 ` Martin Jansa
@ 2015-12-22 16:44 ` Andreas Müller
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2015-12-22 16:44 UTC (permalink / raw)
To: openembedded-devel
On Tue, Dec 22, 2015 at 5:40 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Dec 22, 2015 at 05:14:23PM +0100, Andreas Müller wrote:
>> On Tue, Dec 15, 2015 at 12:32 PM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>> > On Thu, Nov 26, 2015 at 9:06 AM, Andreas Müller
>> > <schnitzeltony@googlemail.com> wrote:
>> >> With this we can setup qt-creator to build/debug on target again.
>> >>
>> >> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> >> ---
>> >> ...configure-paths-for-target-qmake-properly.patch | 76 ++++++++++++++++++++++
>> >> recipes-qt/qt5/qtbase_git.bb | 1 +
>> >> 2 files changed, 77 insertions(+)
>> >> create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>> >>
>> >> diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>> >> new file mode 100644
>> >> index 0000000..efd27a5
>> >> --- /dev/null
>> >> +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
>> >> @@ -0,0 +1,76 @@
>> >> +From fb519b08f564a8a640b1b2f2b6a3bd54a83e19e8 Mon Sep 17 00:00:00 2001
>> >> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>> >> +Date: Fri, 13 Nov 2015 12:36:11 +0100
>> >> +Subject: [PATCH] configure paths/mkspecs for target qmake properly
>> >> +MIME-Version: 1.0
>> >> +Content-Type: text/plain; charset=UTF-8
>> >> +Content-Transfer-Encoding: 8bit
>> >> +
>> >> +to use this patch in all qtbase/qtbase-native(sdk) changes ore made
>> >> +conditionally based on QT_CROSS_COMPILE
>> >> +
>> >> +Upstream-Status: Inappropriate [OE specific]
>> >> +
>> >> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> >> +---
>> >> + configure | 23 +++++++++++++++++++----
>> >> + 1 file changed, 19 insertions(+), 4 deletions(-)
>> >> +
>> >> +diff --git a/configure b/configure
>> >> +index 6edfffd..de74a29 100755
>> >> +--- a/configure
>> >> ++++ b/configure
>> >> +@@ -3857,8 +3857,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
>> >> + QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
>> >> + fi
>> >> +
>> >> +-shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> >> +-shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> >> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
>> >> ++ shortxspec=linux-g++
>> >> ++ shortspec=linux-g++
>> >> ++else
>> >> ++ shortxspec=`echo $XQMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> >> ++ shortspec=`echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"`
>> >> ++fi
>> >> +
>> >> + QT_CONFIGURE_STR_OFF=0
>> >> +
>> >> +@@ -3891,7 +3896,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
>> >> +
>> >> + QT_CONFIGURE_STR_OFFSETS=
>> >> + QT_CONFIGURE_STRS=
>> >> +-addConfStr "$CFG_SYSROOT"
>> >> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
>> >> ++ addConfStr ""
>> >> ++else
>> >> ++ addConfStr "$CFG_SYSROOT"
>> >> ++fi
>> >> + addConfStr "$QT_REL_HOST_BINS"
>> >> + addConfStr "$QT_REL_HOST_LIBS"
>> >> + addConfStr "$QT_REL_HOST_DATA"
>> >> +@@ -3903,6 +3912,12 @@ addConfStr "$shortspec"
>> >> + #-------------------------------------------------------------------------------
>> >> + [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
>> >> +
>> >> ++if [ "$QT_CROSS_COMPILE" = "yes" ] ; then
>> >> ++ QT_TARGET_PREFIX=$QT_EXT_PREFIX
>> >> ++else
>> >> ++ QT_TARGET_PREFIX=$QT_HOST_PREFIX
>> >> ++fi
>> >> ++
>> >> + cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
>> >> + /* License Info */
>> >> + static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=$Licensee";
>> >> +@@ -3915,7 +3930,7 @@ static const char qt_configure_installation [12+11] = "qt_instdate=2
>> >> + static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
>> >> + #ifdef QT_BUILD_QMAKE
>> >> + static const char qt_configure_ext_prefix_path_str [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
>> >> +-static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
>> >> ++static const char qt_configure_host_prefix_path_str [512 + 12] = "qt_hpfxpath=$QT_TARGET_PREFIX";
>> >> + #endif
>> >> +
>> >> + static const short qt_configure_str_offsets[] = {
>> >> +--
>> >> +2.1.0
>> >> +
>> >> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
>> >> index 0ba8ac8..3ef5923 100644
>> >> --- a/recipes-qt/qt5/qtbase_git.bb
>> >> +++ b/recipes-qt/qt5/qtbase_git.bb
>> >> @@ -26,6 +26,7 @@ SRC_URI += "\
>> >> file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
>> >> file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
>> >> file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
>> >> + file://0011-configure-paths-for-target-qmake-properly.patch \
>> >> "
>> >>
>> >> DEPENDS += "qtbase-native"
>> >> --
>> >> 2.1.0
>> >>
>> > Ping
>> Ping for jethro
>
> I wanted to keep it a bit longer in master, but I trust you, so pushed
> to jethro as well.
>
Thanks trusting the only moron running qt-creator on target :)
Andreas
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-12-22 16:44 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-26 8:06 [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][jethro] qtbase: align target qmake paths/mkspec Andreas Müller
2015-12-15 11:32 ` Andreas Müller
2015-12-22 16:14 ` Andreas Müller
2015-12-22 16:40 ` Martin Jansa
2015-12-22 16:44 ` Andreas Müller
2015-11-26 8:06 ` [PATCH][meta-qt5][master 2/2] " Andreas Müller
2015-12-15 11:32 ` Andreas Müller
2015-12-15 11:32 ` [PATCH][meta-qt5][master 1/2] qt5-creator: building qmldesigner with gcc5 works so enable it Andreas Müller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.