diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-11-18 16:48:32 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-18 17:17:11 -0800 |
commit | 53d431639a1ef93992fa2b7da229f167e23e7a23 (patch) | |
tree | 1d091d58adac14aa06aafd7a63694250c55f0d81 /meta-oe/recipes-extended/upm | |
parent | f7a7a2aafe87437aefca21612dc156fde645ac89 (diff) | |
download | meta-openembedded-contrib-53d431639a1ef93992fa2b7da229f167e23e7a23.tar.gz |
upm: Link with libatomic on clang/x86
This is needed for atomic<double> which clang does not use intrinsic
function for on 32bit x86
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/upm')
-rw-r--r-- | meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-extended/upm/upm_git.bb | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch b/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch new file mode 100644 index 0000000000..c16b8dbc5a --- /dev/null +++ b/meta-oe/recipes-extended/upm/upm/0001-nmea_gps-Link-with-latomic.patch @@ -0,0 +1,27 @@ +From 996d37fc0b7177ee57788399b9140032d5de2765 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 18 Nov 2019 15:50:02 -0800 +Subject: [PATCH] nmea_gps: Link with latomic + +clang/x86 ends up with missing symbols for atomics due to atomic<double> +with libstdc++, it works ok with libc++ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/nmea_gps/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nmea_gps/CMakeLists.txt b/src/nmea_gps/CMakeLists.txt +index b3fb6591..5280bfed 100644 +--- a/src/nmea_gps/CMakeLists.txt ++++ b/src/nmea_gps/CMakeLists.txt +@@ -6,4 +6,4 @@ upm_mixed_module_init (NAME nmea_gps + CPP_SRC nmea_gps.cxx + FTI_SRC nmea_gps_fti.c + CPP_WRAPS_C +- REQUIRES mraa utilities-c ${CMAKE_THREAD_LIBS_INIT}) ++ REQUIRES mraa utilities-c atomic ${CMAKE_THREAD_LIBS_INIT}) +-- +2.24.0 + diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index fb22e83359..dbe97370d5 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -15,6 +15,8 @@ SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ file://0001-Use-stdint-types.patch \ " +SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch " + S = "${WORKDIR}/git" # Depends on mraa which only supports x86 and ARM for now |