diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-27 09:07:50 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-27 09:07:50 +0200 |
| commit | e428a2cf2656850be0e95289586d012ac0e7c829 (patch) | |
| tree | b1767e219083132a259154b7ab447584ac0fe5bd /patches | |
| parent | 961993bb4b1f1350f7817105455cb179c86b6b9f (diff) | |
| download | ptxdist-e428a2cf2656850be0e95289586d012ac0e7c829.tar.gz ptxdist-e428a2cf2656850be0e95289586d012ac0e7c829.tar.xz | |
qt5: add build fix for PowerPC
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/qt-everywhere-opensource-src-5.6.0/0103-qt3d-link-with-latomic-if-necessary.patch | 25 | ||||
| -rw-r--r-- | patches/qt-everywhere-opensource-src-5.6.0/series | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/patches/qt-everywhere-opensource-src-5.6.0/0103-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-opensource-src-5.6.0/0103-qt3d-link-with-latomic-if-necessary.patch new file mode 100644 index 000000000..0e62abc48 --- /dev/null +++ b/patches/qt-everywhere-opensource-src-5.6.0/0103-qt3d-link-with-latomic-if-necessary.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Thu, 21 Apr 2016 16:25:30 +0200 +Subject: [PATCH] qt3d: link with -latomic if necessary + +Without this, building qt3d on PowerPC fails with: + +.obj/qnodeid.o:qnodeid.cpp:function Qt3DCore::QNodeId::createId(): error: undefined reference to '__atomic_fetch_add_8' + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + qt3d/src/core/nodes/nodes.pri | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/qt3d/src/core/nodes/nodes.pri b/qt3d/src/core/nodes/nodes.pri +index 64823813e1d3..d4cd1b5b923a 100644 +--- a/qt3d/src/core/nodes/nodes.pri ++++ b/qt3d/src/core/nodes/nodes.pri +@@ -1,5 +1,7 @@ + INCLUDEPATH += $$PWD + ++atomic64-libatomic: LIBS += -latomic ++ + HEADERS += \ + $$PWD/qnode.h \ + $$PWD/qnode_p.h \ diff --git a/patches/qt-everywhere-opensource-src-5.6.0/series b/patches/qt-everywhere-opensource-src-5.6.0/series index 729190f63..b3fea8ba7 100644 --- a/patches/qt-everywhere-opensource-src-5.6.0/series +++ b/patches/qt-everywhere-opensource-src-5.6.0/series @@ -6,8 +6,9 @@ 0100-eglfs-plugin-needs-egl-for-correct-cflags.patch 0101-qtwebengine-make-sure-sysroot-is-always-set-on-ARM.patch 0102-qtbase-examples-fix-building-without-session-managem.patch +0103-qt3d-link-with-latomic-if-necessary.patch #tag:hacks --start-number 200 0200-ptxdist-qtwebengine-allow-building-with-ptxdsit.patch 0201-HACK-put-wayland-scanner-outout-in-srcdir.patch 0202-qtwebengine-define-TRUE-in-case-of-USE_SYSTEM_LIBJPE.patch -# f5d40d79a61654f5248844f73c0274f0 - git-ptx-patches magic +# d5dd92d5dbf8f69f80adb7ff72e9f273 - git-ptx-patches magic |