qt5: bump to 5.3.2
PATCH 1/1 qt5: bump to 5.3.2
Only use ccache prefix in QMAKE_CC and QMAKE_CXX since the build system is broken when QMAKE_AR contains a space character.
Remove the upstreamed uClibc patch.
--- package/qt5/qt5.mk | 2 +- .../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 6 +++- ...ase-0004-QDnsLookup-Fix-build-with-uClibc.patch | 35 ---------------------- package/qt5/qt5base/qt5base.mk | 3 +- 4 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 package/qt5/qt5base/qt5base-0004-QDnsLookup-Fix-build-with-uClibc.patch
package/qt5/qt5.mk +1 -1
@@ -1,5 +1,5 @@ QT5_VERSION_MAJOR = 5.3 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt-project.org/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk))
package/qt5/qt5base/qt5base-0002-mkspecs-files.patch +5 -1
@@ -14,9 +14,13 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,12 @@ +@@ -0,0 +1,16 @@ +include(../common/linux_device_pre.conf) + ++# modifications to g++-unix.conf ++QMAKE_CC = $${BR_CCACHE} $${CROSS_COMPILE}gcc ++QMAKE_CXX = $${BR_CCACHE} $${CROSS_COMPILE}g++ ++ +#modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}
package/qt5/qt5base/qt5base-0004-QDnsLookup-Fix-build-with-uClibc.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From af2241c678bcd9af58d38f98f5caec96a498733e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <[email protected]> -Date: Fri, 23 May 2014 17:02:01 +0300 -Subject: [PATCH] QDnsLookup: Fix build with uClibc - -uClibc doesn't have a nsmap member in __res_state. Since it also doesn't have -res_nquery() which is mandatory for QDnsLookup, we can simply disable the code -to fix the build. - -Sent-Upstream: https://codereview.qt-project.org/86159 -Signed-off-by: Fatih A??c? <[email protected]> -Change-Id: Ia872f535519aca3a2de763548c6dd0e3e0ee20d4 ---- - src/network/kernel/qdnslookup_unix.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 26834df..2a482a6 100644 ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -160,9 +160,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - Q_CHECK_PTR(ns); - state._u._ext.nsaddrs[0] = ns; - } -+#ifndef __UCLIBC__ - // Set nsmap[] to indicate that nsaddrs[0] is an IPv6 address - // See: https://sourceware.org/ml/libc-hacker/2002-05/msg00035.html - state._u._ext.nsmap[0] = MAXNS + 1; -+#endif - state._u._ext.nscount6 = 1; - ns->sin6_family = AF_INET6; - ns->sin6_port = htons(53); --- -1.9.1 -
package/qt5/qt5base/qt5base.mk +2 -1
@@ -190,7 +190,8 @@ define QT5BASE_CONFIGURE_CMDS -no-rpath \ -nomake tests \ -device buildroot \ - -device-option CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ + -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ + -device-option BR_CCACHE="$(CCACHE)" \ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \ -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \
Signature · 1 line
1.9.1
PATCH 1/1 qt5: bump to 5.3.2
Hello Fatih,
you are fixing a problem which seems not to be related with the version bump. Should you send separate patches?
Signature · 1 line
Vincent
Quoted 100 lines · Fatih A??c?
Only use ccache prefix in
QMAKE_CCandQMAKE_CXXsince the build system is broken whenQMAKE_ARcontains a space character.Remove the upstreamed uClibc patch.
Signed-off-by Fatih A??c? <[email protected]>--- package/qt5/qt5.mk | 2 +- .../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 6 +++- ...ase-0004-QDnsLookup-Fix-build-with-uClibc.patch | 35 ---------------------- package/qt5/qt5base/qt5base.mk | 3 +- 4 files changed, 8 insertions(+), 38 deletions(-)delete mode 100644
package/qt5/qt5base/qt5base-0004-QDnsLookup-Fix-build-with-uClibc.patchpackage/qt5/qt5.mk +1
-1@@ -1,5 +1,5 @@ QT5_VERSION_MAJOR = 5.3 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SITE = http://download.qt-project.org/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules include $(sort $(wildcard package/qt5/*/*.mk))package/qt5/qt5base/qt5base-0002-mkspecs-files.patch +5
-1@@ -14,9 +14,13 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,12 @@ +@@ -0,0 +1,16 @@ +include(../common/linux_device_pre.conf) + ++# modifications to g++-unix.conf ++QMAKE_CC = $${BR_CCACHE} $${CROSS_COMPILE}gcc ++QMAKE_CXX = $${BR_CCACHE} $${CROSS_COMPILE}g++ ++ +#modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS}package/qt5/qt5base/qt5base-0004-QDnsLookup-Fix-build-with-uClibc.patch deleted +0
-35@@ -1,35 +0,0 @@ -From af2241c678bcd9af58d38f98f5caec96a498733e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <[email protected]> -Date: Fri, 23 May 2014 17:02:01 +0300 -Subject: [PATCH] QDnsLookup: Fix build with uClibc - -uClibc doesn't have a nsmap member in __res_state. Since it also doesn't have -res_nquery() which is mandatory for QDnsLookup, we can simply disable the code -to fix the build. - -Sent-Upstream: https://codereview.qt-project.org/86159 -Signed-off-by: Fatih A??c? <[email protected]> -Change-Id: Ia872f535519aca3a2de763548c6dd0e3e0ee20d4 ---- - src/network/kernel/qdnslookup_unix.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp -index 26834df..2a482a6 100644 ---- a/src/network/kernel/qdnslookup_unix.cpp -+++ b/src/network/kernel/qdnslookup_unix.cpp -@@ -160,9 +160,11 @@ void QDnsLookupRunnable::query(const int requestType, const QByteArray &requestN - Q_CHECK_PTR(ns); - state._u._ext.nsaddrs[0] = ns; - } -+#ifndef __UCLIBC__ - // Set nsmap[] to indicate that nsaddrs[0] is an IPv6 address - // See: https://sourceware.org/ml/libc-hacker/2002-05/msg00035.html - state._u._ext.nsmap[0] = MAXNS + 1; -+#endif - state._u._ext.nscount6 = 1; - ns->sin6_family = AF_INET6; - ns->sin6_port = htons(53); --- -1.9.1 -package/qt5/qt5base/qt5base.mk +2
-1@@ -190,7 +190,8 @@ define QT5BASE_CONFIGURE_CMDS -no-rpath \ -nomake tests \ -device buildroot \ - -device-option CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \ + -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ + -device-option BR_CCACHE="$(CCACHE)" \ -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \ -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \ -device-option EGLFS_PLATFORM_HOOKS_SOURCES="$(QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES)" \
PATCH 1/1 qt5: bump to 5.3.2
Quoted 1 line · On Tuesday 16 September 2014 19:04:09 Vicente Olivert Riera wrote:
Hello Fatih,
Hello,
Quoted 2 lines
you are fixing a problem which seems not to be related with the version bump. Should you send separate patches?
It would be better to have seperate patches; but it is not so unrelated since the bug appears because of a change in this new version :)
Regards,
Fatih
PATCH 1/1 qt5: bump to 5.3.2
In reply to Fatih AşıcıQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fatih" == Fatih A??c? <[email protected]> writes:
Only use ccache prefix in
QMAKE_CCandQMAKE_CXXsince the build system is broken whenQMAKE_ARcontains a space character.Remove the upstreamed uClibc patch.
Signed-off-by Fatih A??c? <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard