diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 17:36:33 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-06-02 17:41:24 +0200 |
| commit | 57b20a5b62fd76d6be6d132090952c6553bcd100 (patch) | |
| tree | b540d93f14452bc21979f5ca3029dfd41bda3851 | |
| parent | e1967dc37e5b6735161f98fb3818948c4196cfab (diff) | |
| download | ptxdist-57b20a5b62fd76d6be6d132090952c6553bcd100.tar.gz ptxdist-57b20a5b62fd76d6be6d132090952c6553bcd100.tar.xz | |
qt5: fix building with older host compilers
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/qt-everywhere-opensource-src-5.4.1/0006-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch | 24 | ||||
| -rw-r--r-- | patches/qt-everywhere-opensource-src-5.4.1/series | 3 |
2 files changed, 26 insertions, 1 deletions
diff --git a/patches/qt-everywhere-opensource-src-5.4.1/0006-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch b/patches/qt-everywhere-opensource-src-5.4.1/0006-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch new file mode 100644 index 000000000..df027434d --- /dev/null +++ b/patches/qt-everywhere-opensource-src-5.4.1/0006-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Tue, 2 Jun 2015 17:35:01 +0200 +Subject: [PATCH] featuresfeatures: don't use gold linker for host tools + +The check it it is supported was only done for the target. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + qtbase/mkspecs/features/default_post.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/mkspecs/features/default_post.prf b/qtbase/mkspecs/features/default_post.prf +index e967399258ad..7f08ba31c308 100644 +--- a/qtbase/mkspecs/features/default_post.prf ++++ b/qtbase/mkspecs/features/default_post.prf +@@ -62,7 +62,7 @@ debug { + QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE + } + +-use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD ++!host_build: use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD + + dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL + static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB diff --git a/patches/qt-everywhere-opensource-src-5.4.1/series b/patches/qt-everywhere-opensource-src-5.4.1/series index 77430a5b4..12cad07cd 100644 --- a/patches/qt-everywhere-opensource-src-5.4.1/series +++ b/patches/qt-everywhere-opensource-src-5.4.1/series @@ -5,4 +5,5 @@ 0003-qtmultimedia-videonode-plugins-require-qtmultimediaq.patch 0004-HACK-put-wayland-scanner-outout-in-srcdir.patch 0005-Fix-building-with-glib-2.43.patch -# f9eaf7898f328182d7be3bd849063c67 - git-ptx-patches magic +0006-featuresfeatures-don-t-use-gold-linker-for-host-tool.patch +# 7b1076673021258d8f755c93eb67e4c5 - git-ptx-patches magic |