diff options
| author | Alistair Francis <alistair.francis@wdc.com> | 2020-08-12 17:23:15 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-02 15:16:33 +0200 |
| commit | c8d191d19dda5ec126630c6c91ea46b00a83fe29 (patch) | |
| tree | bb80658872978c7d33fb6306309c5129e803c66f | |
| parent | f565d6c90bab808b855c64ef75b2579fc26a572c (diff) | |
| download | meta-qt5-c8d191d19dda5ec126630c6c91ea46b00a83fe29.tar.gz | |
qt5: Link with -pthread for riscv64
Linking with -pthread fixes the missing atomic linker failures on riscv64.
Thsi fixes the following linker errors:
qtestcase.h:359: more undefined references to `__atomic_fetch_xor_1' follow
collect2: error: ld returned 1 exit status
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7f6fd956..129c4084 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -172,6 +172,8 @@ QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '- | |||
| 172 | QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker" | 172 | QT_CONFIG_FLAGS_GOLD = "-no-use-gold-linker" |
| 173 | LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 173 | LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
| 174 | 174 | ||
| 175 | LDFLAGS_append_riscv64 = " -pthread" | ||
| 176 | |||
| 175 | QT_CONFIG_FLAGS += " \ | 177 | QT_CONFIG_FLAGS += " \ |
| 176 | ${QT_CONFIG_FLAGS_GOLD} \ | 178 | ${QT_CONFIG_FLAGS_GOLD} \ |
| 177 | -shared \ | 179 | -shared \ |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index d20f8f13..1a42b81d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
| @@ -19,6 +19,8 @@ SRC_URI += " \ | |||
| 19 | file://0002-Use-python3-explicitly.patch \ | 19 | file://0002-Use-python3-explicitly.patch \ |
| 20 | " | 20 | " |
| 21 | 21 | ||
| 22 | LDFLAGS_append_riscv64 = " -pthread" | ||
| 23 | |||
| 22 | DEPENDS += "qtbase qtdeclarative-native" | 24 | DEPENDS += "qtbase qtdeclarative-native" |
| 23 | 25 | ||
| 24 | PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" | 26 | PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}" |
