diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-04 15:46:00 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-04 15:47:43 +0200 |
| commit | f2a65e959716efcef5569abe43b764b68c3fff1e (patch) | |
| tree | 8d3f85c8b6d184d58c2a5adb0d9135120ffb066f /patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch | |
| parent | 640410438b387f11241a8e92b6db4dd4c7ab35bd (diff) | |
| download | ptxdist-2019.07.0.tar.gz ptxdist-2019.07.0.tar.xz | |
qt5: add upstream fix for webengine ARM thumb detectionptxdist-2019.07.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch')
| -rw-r--r-- | patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch b/patches/qt-everywhere-src-5.12.2/0102-qt3d-link-with-latomic-if-necessary.patch new file mode 100644 index 000000000..6445dc4f4 --- /dev/null +++ b/patches/qt-everywhere-src-5.12.2/0102-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 785ae2b21472..de97caee8662 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 \ |