blob: dbc90227a5f4d833c862ca5900f29647547fd307 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001From 6742ac7ea6fd1e9c82ecb5305f84e721242f857d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 5 Dec 2012 07:48:15 +0200
4Subject: [PATCH 21/21] configure: make qt4-native work with long building
5 path.
6
7Upstream-Status: Submitted
8
9Reference: https://bugreports.qt-project.org/browse/QTBUG-28292
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 configure | 52 ++++++++++++++++++++++++++--------------------------
15 1 file changed, 26 insertions(+), 26 deletions(-)
16
17diff --git a/configure b/configure
18index a4a42f1..2358563 100755
19--- a/configure
20+++ b/configure
21@@ -4779,8 +4779,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST
22 TODAY=`date +%Y-%m-%d`
23 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
24 /* License Info */
25-static const char qt_configure_licensee_str [256 + 12] = "$LICENSE_USER_STR";
26-static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
27+static const char qt_configure_licensee_str [512 + 12] = "$LICENSE_USER_STR";
28+static const char qt_configure_licensed_products_str [512 + 12] = "$LICENSE_PRODUCTS_STR";
29
30 /* Installation date */
31 static const char qt_configure_installation [12+11] = "qt_instdate=$TODAY";
32@@ -4805,36 +4805,36 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then
33
34 #if defined(QT_BOOTSTRAPPED) || defined(QT_BUILD_QMAKE)
35 /* Installation Info */
36-static const char qt_configure_prefix_path_str [256 + 12] = "$HOSTPREFIX_PATH_STR";
37-static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
38-static const char qt_configure_headers_path_str [256 + 12] = "$HOSTHEADERS_PATH_STR";
39-static const char qt_configure_libraries_path_str [256 + 12] = "$HOSTLIBRARIES_PATH_STR";
40-static const char qt_configure_binaries_path_str [256 + 12] = "$HOSTBINARIES_PATH_STR";
41-static const char qt_configure_plugins_path_str [256 + 12] = "$HOSTPLUGINS_PATH_STR";
42-static const char qt_configure_imports_path_str [256 + 12] = "$HOSTIMPORTS_PATH_STR";
43-static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PATH_STR";
44-static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
45-static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR";
46-static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR";
47-static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR";
48+static const char qt_configure_prefix_path_str [512 + 12] = "$HOSTPREFIX_PATH_STR";
49+static const char qt_configure_documentation_path_str[512 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
50+static const char qt_configure_headers_path_str [512 + 12] = "$HOSTHEADERS_PATH_STR";
51+static const char qt_configure_libraries_path_str [512 + 12] = "$HOSTLIBRARIES_PATH_STR";
52+static const char qt_configure_binaries_path_str [512 + 12] = "$HOSTBINARIES_PATH_STR";
53+static const char qt_configure_plugins_path_str [512 + 12] = "$HOSTPLUGINS_PATH_STR";
54+static const char qt_configure_imports_path_str [512 + 12] = "$HOSTIMPORTS_PATH_STR";
55+static const char qt_configure_data_path_str [512 + 12] = "$HOSTDATA_PATH_STR";
56+static const char qt_configure_translations_path_str [512 + 12] = "$HOSTTRANSLATIONS_PATH_STR";
57+static const char qt_configure_settings_path_str [512 + 12] = "$HOSTSETTINGS_PATH_STR";
58+static const char qt_configure_examples_path_str [512 + 12] = "$HOSTEXAMPLES_PATH_STR";
59+static const char qt_configure_demos_path_str [512 + 12] = "$HOSTDEMOS_PATH_STR";
60 #else // QT_BOOTSTRAPPED
61 EOF
62 fi
63
64 cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
65 /* Installation Info */
66-static const char qt_configure_prefix_path_str [256 + 12] = "$PREFIX_PATH_STR";
67-static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
68-static const char qt_configure_headers_path_str [256 + 12] = "$HEADERS_PATH_STR";
69-static const char qt_configure_libraries_path_str [256 + 12] = "$LIBRARIES_PATH_STR";
70-static const char qt_configure_binaries_path_str [256 + 12] = "$BINARIES_PATH_STR";
71-static const char qt_configure_plugins_path_str [256 + 12] = "$PLUGINS_PATH_STR";
72-static const char qt_configure_imports_path_str [256 + 12] = "$IMPORTS_PATH_STR";
73-static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_STR";
74-static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR";
75-static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR";
76-static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR";
77-static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR";
78+static const char qt_configure_prefix_path_str [512 + 12] = "$PREFIX_PATH_STR";
79+static const char qt_configure_documentation_path_str[512 + 12] = "$DOCUMENTATION_PATH_STR";
80+static const char qt_configure_headers_path_str [512 + 12] = "$HEADERS_PATH_STR";
81+static const char qt_configure_libraries_path_str [512 + 12] = "$LIBRARIES_PATH_STR";
82+static const char qt_configure_binaries_path_str [512 + 12] = "$BINARIES_PATH_STR";
83+static const char qt_configure_plugins_path_str [512 + 12] = "$PLUGINS_PATH_STR";
84+static const char qt_configure_imports_path_str [512 + 12] = "$IMPORTS_PATH_STR";
85+static const char qt_configure_data_path_str [512 + 12] = "$DATA_PATH_STR";
86+static const char qt_configure_translations_path_str [512 + 12] = "$TRANSLATIONS_PATH_STR";
87+static const char qt_configure_settings_path_str [512 + 12] = "$SETTINGS_PATH_STR";
88+static const char qt_configure_examples_path_str [512 + 12] = "$EXAMPLES_PATH_STR";
89+static const char qt_configure_demos_path_str [512 + 12] = "$DEMOS_PATH_STR";
90 EOF
91
92 if [ ! -z "$QT_HOST_PREFIX" ]; then
93--
941.8.0
95