diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-10 14:46:20 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 15:37:16 +0200 |
| commit | 8b18ff5c34897b765c7a5d70bdef06e6c1a96f6c (patch) | |
| tree | a6601423483f1a6738c7ed6b957111f2f6e0489d /meta-oe/recipes-navigation | |
| parent | 82a00431d7bb48ba2d2e7201c7fe4faa6a3bf3ad (diff) | |
| download | meta-openembedded-8b18ff5c34897b765c7a5d70bdef06e6c1a96f6c.tar.gz | |
gpsd: Fix build with gcc-5.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-Include-stdatomic.h-only-in-C-mode.patch | 43 | ||||
| -rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb | 1 |
2 files changed, 44 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-Include-stdatomic.h-only-in-C-mode.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-Include-stdatomic.h-only-in-C-mode.patch new file mode 100644 index 0000000000..bc9167eeec --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-Include-stdatomic.h-only-in-C-mode.patch @@ -0,0 +1,43 @@ +From 79f6d9133378325d70a92e66f7352c1becefbb88 Mon Sep 17 00:00:00 2001 +From: Gleb Smirnoff <glebius@FreeBSD.org> +Date: Sat, 16 May 2015 02:47:28 +0300 +Subject: [PATCH] Include <stdatomic.h> only in C mode. + +Upstream-Status: Backport from 3.15 + +Without this build with gcc-5.2 fails with: +| arm-oe-linux-gnueabi-g++ -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/build/shr-core/tmp-glibc/sysroots/om-gta02 -o clock_gettime-qt.os -c -O2 -pipe -g -feliminate-unused-debug-types --sysroot=/OE/build/shr-core/tmp-glibc/sysroots/om-gta02 -Wextra -Wall -Wno-uninitialized -Wno-missing-field-initializers -Wcast-align -Wmissing-declarations -Wpointer-arith -Wreturn-type -pthread -Wmissing-declarations -g -O0 -pthread -fPIC -DUSE_QT -DQT_SHARED -I/OE/build/shr-core/tmp-glibc/sysroots/om-gta02/usr/include/dbus-1.0 -I/OE/build/shr-core/tmp-glibc/sysroots/om-gta02/usr/lib/dbus-1.0/include -I/OE/build/shr-core/tmp-glibc/sysroots/om-gta02/usr/include/qt4/QtNetwork -I/OE/build/shr-core/tmp-glibc/sysroots/om-gta02/usr/include/qt4 -I/OE/build/shr-core/tmp-glibc/sysroots/om-gta02/usr/include/qt4/QtCore clock_gettime.c +| In file included from compiler.h:50:0, +| from clock_gettime.c:10: +| /OE/build/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/lib/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/5.2.0/include/stdatomic.h:40:9: error: '_Atomic' does not name a type +| typedef _Atomic _Bool atomic_bool; +| ^ +.... + +More info: +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932 + +Signed-off-by: Gary E. Miller <gem@rellim.com> +--- + compiler.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compiler.h b/compiler.h +index 837c935..03430c0 100644 +--- a/compiler.h ++++ b/compiler.h +@@ -66,9 +66,9 @@ + } while (0) + + #ifdef HAVE_STDATOMIC_H +-#ifndef __COVERITY__ /* Coverity is confused by a GNU typedef */ ++#if !defined(__COVERITY__) && !defined(__cplusplus) + #include <stdatomic.h> +-#endif /* __COVERITY__ */ ++#endif /* __COVERITY__ || __cplusplus */ + #endif /* HAVE_STDATOMIC_H */ + + #ifdef HAVE_OSATOMIC_H +-- +2.5.1 + diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb index 272bba8c2a..dae39c24b8 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb @@ -15,6 +15,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch \ file://0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch \ file://0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch \ + file://0001-Include-stdatomic.h-only-in-C-mode.patch \ file://gpsd-default \ file://gpsd \ file://60-gpsd.rules \ |