--- /dev/null
+Add a Buildroot 'device' to ease cross-compilation
+
+Qt5 has a mechanism to support "device" profiles, so that people can
+specify the compiler, compiler flags and so on for a specific device.
+
+We leverage this mechanism in the Buildroot packaging of qt5 to
+simplify cross-compilation: we have our own "device" definition, which
+allows us to easily pass the cross-compiler paths and flags from our
+qt5.mk.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
+===================================================================
+--- /dev/null
++++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
+@@ -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}
++QMAKE_CXXFLAGS_RELEASE += -O3
++CONFIG += nostrip
++
++QMAKE_LIBS += -lrt -lpthread -ldl
++
++include(../common/linux_device_post.conf)
++load(qt_config)
+Index: b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
+===================================================================
+--- /dev/null
++++ b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
+@@ -0,0 +1 @@
++#include "../../linux-g++/qplatformdefs.h"
+++ /dev/null
-Add a Buildroot 'device' to ease cross-compilation
-
-Qt5 has a mechanism to support "device" profiles, so that people can
-specify the compiler, compiler flags and so on for a specific device.
-
-We leverage this mechanism in the Buildroot packaging of qt5 to
-simplify cross-compilation: we have our own "device" definition, which
-allows us to easily pass the cross-compiler paths and flags from our
-qt5.mk.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf
-===================================================================
---- /dev/null
-+++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf
-@@ -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}
-+QMAKE_CXXFLAGS_RELEASE += -O3
-+CONFIG += nostrip
-+
-+QMAKE_LIBS += -lrt -lpthread -ldl
-+
-+include(../common/linux_device_post.conf)
-+load(qt_config)
-Index: b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
-===================================================================
---- /dev/null
-+++ b/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
-@@ -0,0 +1 @@
-+#include "../../linux-g++/qplatformdefs.h"
--- /dev/null
+The vivante headers pull in X11 defines which break eglconvenience
+
+* Adds a missing include to qeglplatformcontext.cpp
+* Fix namespace collision on CursorShape, pulled in from X11/X.h
+* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
+
+[based on patch from Yocto project]
+Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
+
+
+diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
+--- a/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:54:52.874278651 -0400
+@@ -30,8 +30,10 @@
+ }
+ }
+
+- # Avoid X11 header collision
+- DEFINES += MESA_EGL_NO_X11_HEADERS
++ !contains(QT_CONFIG,xcb) {
++ # Avoid X11 header collision
++ DEFINES += MESA_EGL_NO_X11_HEADERS
++ }
+
+ contains(QT_CONFIG,xlib) {
+ HEADERS += \
+diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:56:00.630280249 -0400
+@@ -39,6 +39,7 @@
+ **
+ ****************************************************************************/
+
++#include <qtextstream.h>
+ #include "qeglplatformcontext_p.h"
+ #include "qeglconvenience_p.h"
+ #include "qeglpbuffer_p.h"
+--- a/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:53:50.038277168 -0400
++++ b/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:58:49.014284222 -0400
+@@ -42,6 +42,11 @@
+ #ifndef QEGLPLATFORMCURSOR_H
+ #define QEGLPLATFORMCURSOR_H
+
++// avoid namespace collision with X11/X.h
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ #include <qpa/qplatformcursor.h>
+ #include <qpa/qplatformscreen.h>
+
+--- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp
++++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp
+@@ -41,8 +41,8 @@
+
+ #include <QtGui/private/qguiapplication_p.h>
+
+-#include "qeglplatformcursor_p.h"
+ #include "qeglplatformintegration_p.h"
++#include "qeglplatformcursor_p.h"
+ #include "qeglplatformscreen_p.h"
+
+ QT_BEGIN_NAMESPACE
+
--- /dev/null
+From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 19 May 2015 21:30:21 +0200
+Subject: [PATCH] Disable gold linker/new dtags support for host builds
+
+There is no test for gold linker and new dtags support for the host build
+(only for the target compiler/build) which leads to trouble in some cross
+compiling environments (see [1] for details).
+
+So disable gold linker/new dtags support unconditionally for host builds.
+
+[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html
+
+Task-number: QTBUG-46125
+Change-Id: Ic62828704dcce461487d63860705158cce3e4af8
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
+---
+ mkspecs/features/default_post.prf | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
+index 8e68b95..bcaddc8 100644
+--- a/mkspecs/features/default_post.prf
++++ b/mkspecs/features/default_post.prf
+@@ -62,8 +62,11 @@ debug {
+ QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
+ }
+
+-use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
+-enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS
++# disable special linker flags for host builds (no proper test for host support yet)
++!host_build {
++ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
++ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS
++}
+
+ dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
+ static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+--
+2.1.0
+
+++ /dev/null
-The vivante headers pull in X11 defines which break eglconvenience
-
-* Adds a missing include to qeglplatformcontext.cpp
-* Fix namespace collision on CursorShape, pulled in from X11/X.h
-* Do not pass MESA_EGL_NO_X11_HEADERS when xcb is use
-
-[based on patch from Yocto project]
-Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
-
-
-diff -Nuar a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri
---- a/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:53:50.038277168 -0400
-+++ b/src/platformsupport/eglconvenience/eglconvenience.pri 2014-08-07 16:54:52.874278651 -0400
-@@ -30,8 +30,10 @@
- }
- }
-
-- # Avoid X11 header collision
-- DEFINES += MESA_EGL_NO_X11_HEADERS
-+ !contains(QT_CONFIG,xcb) {
-+ # Avoid X11 header collision
-+ DEFINES += MESA_EGL_NO_X11_HEADERS
-+ }
-
- contains(QT_CONFIG,xlib) {
- HEADERS += \
-diff -Nuar a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
---- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:53:50.038277168 -0400
-+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 2014-08-07 16:56:00.630280249 -0400
-@@ -39,6 +39,7 @@
- **
- ****************************************************************************/
-
-+#include <qtextstream.h>
- #include "qeglplatformcontext_p.h"
- #include "qeglconvenience_p.h"
- #include "qeglpbuffer_p.h"
---- a/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:53:50.038277168 -0400
-+++ b/src/platformsupport/eglconvenience/qeglplatformcursor_p.h 2014-08-07 16:58:49.014284222 -0400
-@@ -42,6 +42,11 @@
- #ifndef QEGLPLATFORMCURSOR_H
- #define QEGLPLATFORMCURSOR_H
-
-+// avoid namespace collision with X11/X.h
-+#ifdef CursorShape
-+#undef CursorShape
-+#endif
-+
- #include <qpa/qplatformcursor.h>
- #include <qpa/qplatformscreen.h>
-
---- qt5base-5.5.0.orig/src/platformsupport/eglconvenience/qeglplatformcursor.cpp
-+++ qt5base-5.5.0/src/platformsupport/eglconvenience/qeglplatformcursor.cpp
-@@ -41,8 +41,8 @@
-
- #include <QtGui/private/qguiapplication_p.h>
-
--#include "qeglplatformcursor_p.h"
- #include "qeglplatformintegration_p.h"
-+#include "qeglplatformcursor_p.h"
- #include "qeglplatformscreen_p.h"
-
- QT_BEGIN_NAMESPACE
-
--- /dev/null
+From 62ef0d97cfa2ed0142fc69c6e6395a570bea9215 Mon Sep 17 00:00:00 2001
+From: Julien Corjon <corjon.j@ecagroup.com>
+Date: Tue, 21 Jul 2015 11:59:57 +0200
+Subject: [PATCH] forkd - disable eventfd for uClibc <= 0.9.33
+
+eventfd is not implemented in uClibc <= 0.9.33
+
+Upstream-Status : https://bugreports.qt.io/browse/QTBUG-47337
+
+Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
+---
+ src/3rdparty/forkfd/forkfd.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c
+index 8d08f40..fa47cdf 100644
+--- a/src/3rdparty/forkfd/forkfd.c
++++ b/src/3rdparty/forkfd/forkfd.c
+@@ -48,6 +48,10 @@
+ # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__)
+ # define HAVE_PIPE2 1
+ # endif
++# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33)))
++# undef HAVE_EVENTFD
++# undef HAVE_PIPE2
++# endif
+ #endif
+
+ #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
+--
+2.1.0
+
+++ /dev/null
-From 2cb4b7e947f64580592afaf221d4b261d980bb45 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Tue, 19 May 2015 21:30:21 +0200
-Subject: [PATCH] Disable gold linker/new dtags support for host builds
-
-There is no test for gold linker and new dtags support for the host build
-(only for the target compiler/build) which leads to trouble in some cross
-compiling environments (see [1] for details).
-
-So disable gold linker/new dtags support unconditionally for host builds.
-
-[1] http://lists.busybox.net/pipermail/buildroot/2015-May/128303.html
-
-Task-number: QTBUG-46125
-Change-Id: Ic62828704dcce461487d63860705158cce3e4af8
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
----
- mkspecs/features/default_post.prf | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index 8e68b95..bcaddc8 100644
---- a/mkspecs/features/default_post.prf
-+++ b/mkspecs/features/default_post.prf
-@@ -62,8 +62,11 @@ debug {
- QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
- }
-
--use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
--enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS
-+# disable special linker flags for host builds (no proper test for host support yet)
-+!host_build {
-+ use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD
-+ enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS
-+}
-
- dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
- static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
---
-2.1.0
-
+++ /dev/null
-From 62ef0d97cfa2ed0142fc69c6e6395a570bea9215 Mon Sep 17 00:00:00 2001
-From: Julien Corjon <corjon.j@ecagroup.com>
-Date: Tue, 21 Jul 2015 11:59:57 +0200
-Subject: [PATCH] forkd - disable eventfd for uClibc <= 0.9.33
-
-eventfd is not implemented in uClibc <= 0.9.33
-
-Upstream-Status : https://bugreports.qt.io/browse/QTBUG-47337
-
-Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
----
- src/3rdparty/forkfd/forkfd.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/3rdparty/forkfd/forkfd.c b/src/3rdparty/forkfd/forkfd.c
-index 8d08f40..fa47cdf 100644
---- a/src/3rdparty/forkfd/forkfd.c
-+++ b/src/3rdparty/forkfd/forkfd.c
-@@ -48,6 +48,10 @@
- # if (defined(__GLIBC__) && (__GLIBC__ << 16) + __GLIBC_MINOR__ >= 0x209) || defined(__BIONIC__)
- # define HAVE_PIPE2 1
- # endif
-+# if (defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0) && (__UCLIBC_MINOR__ < 9 || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 33)))
-+# undef HAVE_EVENTFD
-+# undef HAVE_PIPE2
-+# endif
- #endif
-
- #if _POSIX_VERSION-0 >= 200809L || _XOPEN_VERSION-0 >= 500
---
-2.1.0
-
projects / buildroot.git / commitdiff