diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2015-08-25 10:38:13 -0400 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-31 20:49:35 +0200 |
| commit | 069e4d7067e21227ed7e5b7060f43db69bd9339d (patch) | |
| tree | cacd8db4bdf21783326d68e3d83fee944b96964b | |
| parent | 06e1f5b92e4126dda4f549f9ad78455a223d9af2 (diff) | |
qtbase: update patch that increases configured path length for nativesdk
With 5.5, the array of paths got split into at least 3 separate variables,
but only one of them was increased. Similarly, increase the other 2.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch index 91b13534..8f95480c 100644 --- a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch @@ -1,29 +1,36 @@ -From fc3819b1f69278e9d66095d1faf33ae0e5a70eb6 Mon Sep 17 00:00:00 2001 +From fe6405c5a628c168e42138ac82ba70bb8c909d0b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> -Date: Mon, 11 Nov 2013 20:27:30 -0500 -Subject: [PATCH 06/10] configure: bump path length from 256 to 512 characters +Date: Tue, 25 Aug 2015 10:05:15 -0400 +Subject: [PATCH] configure: bump path length from 256 to 512 characters Increase the path length that gets hardcoded into generated config.cpp file from 256 to 512 characters, as nativesdk path can be quite long. +Also update length of EXT_PREFIX and HOST_PREFIX now. + Signed-off-by: Denys Dmytriyenko <denys@ti.com> --- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure -index 548dd0d..b8f1fb9 100755 +index 22867a7..fe18487 100755 --- a/configure +++ b/configure -@@ -3850,7 +3850,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ +@@ -3851,10 +3851,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; /* Installation Info */ -static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; +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 [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; - static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; +-static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; +-static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; ++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"; + #endif + + static const short qt_configure_str_offsets[] = { -- -2.5.0 +2.2.0 |