summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2012-11-30 10:33:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:32:43 +0000
commit202f4ead95c3c5090864df6cb799a25f36996152 (patch)
tree73732fbb1789dcd26c7391d39a44095a7cc9ceba /meta
parente5f6b33b0038c523cf6069a9010445eab93e585d (diff)
downloadpoky-202f4ead95c3c5090864df6cb799a25f36996152.tar.gz
qt4-native: make qt4-native work with long building path
If the TMPDIR has more than 256 chars, building qt4-native fails. This violates the 410 length limit of TMPDIR. This patch makes building qt4-native succeed with a long building path (410 for example) by extending its static arrays' sizes by 256 chars. [YOCTO #2766] (From OE-Core rev: a635553cf46a7e43e81eab1a1baeae98312881d2) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch82
-rw-r--r--meta/recipes-qt/qt4/qt4-native.inc3
2 files changed, 84 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch b/meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch
new file mode 100644
index 0000000000..74f4e1a6f4
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/0001-make-qt4-native-work-with-long-building-path.patch
@@ -0,0 +1,82 @@
1Upstream-Status: Inappropriate [configuration]
2
3Make qt4-native work with long building path.
4
5Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
6
7Index: configure
8=====================================================================
9--- a/configure
10+++ b/configure
11@@ -4764,8 +4764,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST
12 TODAY=`date +%Y-%m-%d`
13 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
14 /* License Info */
15-static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR";
16-static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
17+static const char qt_configure_licensee_str [512 + 12] = "$LICENSE_USER_STR";
18+static const char qt_configure_licensed_products_str [512 + 12] = "$LICENSE_PRODUCTS_STR";
19
20 /* Installation date */
21 static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY";
22@@ -4790,36 +4790,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
23
24 #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
25 /* Installation Info */
26-static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR";
27-static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
28-static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
29-static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
30-static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
31-static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
32-static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
33-static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR";
34-static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
35-static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR";
36-static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
37-static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR";
38+static const char qt_configure_prefix_path_str [512 + 12] = "$HOSTPREFIX_PATH_STR";
39+static const char qt_configure_documentation_path_str[512 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
40+static const char qt_configure_headers_path_str [512 + 12] = "$HOSTHEADERS_PATH_STR";
41+static const char qt_configure_libraries_path_str [512 + 12] = "$HOSTLIBRARIES_PATH_STR";
42+static const char qt_configure_binaries_path_str [512 + 12] = "$HOSTBINARIES_PATH_STR";
43+static const char qt_configure_plugins_path_str [512 + 12] = "$HOSTPLUGINS_PATH_STR";
44+static const char qt_configure_imports_path_str [512 + 12] = "$HOSTIMPORTS_PATH_STR";
45+static const char qt_configure_data_path_str [512 + 12] = "$HOSTDATA_PATH_STR";
46+static const char qt_configure_translations_path_str [512 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
47+static const char qt_configure_settings_path_str [512 + 12] = "$HOSTSETTINGS_PATH_STR";
48+static const char qt_configure_examples_path_str [512 + 12] = "$HOSTEXAMPLES_PATH_STR";
49+static const char qt_configure_demos_path_str [512 + 12] = "$HOSTDEMOS_PATH_STR";
50 #else // QT_BOOTSTRAPPED
51 EOF
52 fi
53
54 cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
55 /* Installation Info */
56-static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR";
57-static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
58-static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
59-static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
60-static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
61-static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
62-static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
63-static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_STR";
64-static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
65-static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR";
66-static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR";
67-static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR";
68+static const char qt_configure_prefix_path_str [512 + 12] = "$PREFIX_PATH_STR";
69+static const char qt_configure_documentation_path_str[512 + 12] = "$DOCUMENTATION_PATH_STR";
70+static const char qt_configure_headers_path_str [512 + 12] = "$HEADERS_PATH_STR";
71+static const char qt_configure_libraries_path_str [512 + 12] = "$LIBRARIES_PATH_STR";
72+static const char qt_configure_binaries_path_str [512 + 12] = "$BINARIES_PATH_STR";
73+static const char qt_configure_plugins_path_str [512 + 12] = "$PLUGINS_PATH_STR";
74+static const char qt_configure_imports_path_str [512 + 12] = "$IMPORTS_PATH_STR";
75+static const char qt_configure_data_path_str [512 + 12] = "$DATA_PATH_STR";
76+static const char qt_configure_translations_path_str [512 + 12] = "$TRANSLATIONS_PATH_STR";
77+static const char qt_configure_settings_path_str [512 + 12] = "$SETTINGS_PATH_STR";
78+static const char qt_configure_examples_path_str [512 + 12] = "$EXAMPLES_PATH_STR";
79+static const char qt_configure_demos_path_str [512 + 12] = "$DEMOS_PATH_STR";
80 EOF
81
82 if [ ! -z "$QT_HOST_PREFIX" ]; then
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index ad207231c7..0dab3641e8 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ 9 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" 10 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
11 11
12INC_PR = "r18" 12INC_PR = "r19"
13 13
14inherit native 14inherit native
15 15
@@ -17,6 +17,7 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr
17 file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ 17 file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
18 file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ 18 file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \
19 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ 19 file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \
20 file://0001-make-qt4-native-work-with-long-building-path.patch \
20 file://g++.conf \ 21 file://g++.conf \
21 file://linux.conf \ 22 file://linux.conf \
22 " 23 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-04 21:52:31 +0000