diff options
author | John Klug <john.klug@multitech.com> | 2016-12-13 18:11:40 -0600 |
---|---|---|
committer | John Klug <john.klug@multitech.com> | 2016-12-13 18:11:40 -0600 |
commit | e8bd6a04652e4faa674b935ae10f5bfa001b8142 (patch) | |
tree | 8c02f80cbd8b65a4aa42a2eb4e36795c7b8f0e05 | |
parent | 04ccf16732f1a0742cb761cd225348e82148091a (diff) | |
download | meta-mlinux-e8bd6a04652e4faa674b935ae10f5bfa001b8142.tar.gz meta-mlinux-e8bd6a04652e4faa674b935ae10f5bfa001b8142.tar.bz2 meta-mlinux-e8bd6a04652e4faa674b935ae10f5bfa001b8142.zip |
Remove patches unlikely to be needed in 3.16 gpsd
5 files changed, 0 insertions, 186 deletions
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch deleted file mode 100644 index 82ac5aa..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c30716be9e615513fe66993fd3cdc818c3d70410 Mon Sep 17 00:00:00 2001 -From: "Gary E. Miller" <gem@rellim.com> -Date: Sun, 15 Mar 2015 11:51:45 -0700 -Subject: [PATCH 1/3] Check for __STDC_NO_ATOMICS__ before using stdatomic.h - ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index adf473d..566c14a 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -633,7 +633,7 @@ else: - announce("You do not have kernel CANbus available.") - env["nmea2000"] = False - -- if config.CheckHeader("stdatomic.h"): -+ if not config.CheckCompilerDefines("__STDC_NO_ATOMICS__") and config.CheckHeader("stdatomic.h"): - confdefs.append("#define HAVE_STDATOMIC_H 1\n") - else: - confdefs.append("/* #undef HAVE_STDATOMIC_H */\n") --- -2.1.0 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-Include-stdatomic.h-only-in-C-mode.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-Include-stdatomic.h-only-in-C-mode.patch deleted file mode 100644 index bc9167e..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-Include-stdatomic.h-only-in-C-mode.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/recipes-navigation/gpsd/gpsd-3.16/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch deleted file mode 100644 index 7a06795..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ff099b1ba8de74df9ddeb61e3825264b96ef692 Mon Sep 17 00:00:00 2001 -From: Moritz Fischer <moritz.fischer@ettus.com> -Date: Tue, 22 Dec 2015 19:38:31 -0800 -Subject: [PATCH] libgpsd-core: Fix issue with ACTIVATE hook not being called. - -In the current system session->mode seemed to ignore the -O_OPTIMIZE flag, leading to the ACTIVATE hook being ignored. - -Another way to fix this would be to keep the session->mode -condition pull up the check for O_CONTINUE. - -Upstream-Status: Backported -This patch is in upstream git - -Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> ---- - libgpsd_core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgpsd_core.c b/libgpsd_core.c -index 31fec2a..a84e85f 100644 ---- a/libgpsd_core.c -+++ b/libgpsd_core.c -@@ -543,7 +543,7 @@ int gpsd_open(struct gps_device_t *session) - int gpsd_activate(struct gps_device_t *session, const int mode) - /* acquire a connection to the GPS device */ - { -- if (session->mode == O_OPTIMIZE) -+ if (mode == O_OPTIMIZE) - gpsd_run_device_hook(&session->context->errout, - session->gpsdata.dev.path, "ACTIVATE"); - session->gpsdata.gps_fd = gpsd_open(session); --- -2.4.3 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch b/recipes-navigation/gpsd/gpsd-3.16/0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch deleted file mode 100644 index 22ee1bd..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 99444b3d2c4a4f7fd7128e60461005780d0c5c83 Mon Sep 17 00:00:00 2001 -From: "Gary E. Miller" <gem@rellim.com> -Date: Sun, 15 Mar 2015 12:05:15 -0700 -Subject: [PATCH 2/3] Add a test for C11 and check we have C11 before using - stdatomic.h - ---- - SConstruct | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index 566c14a..faa8651 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -473,6 +473,20 @@ def CheckCompilerDefines(context, define): - context.Result(ret) - return ret - -+# Check if this compiler is C11 or better -+def CheckC11(context): -+ context.Message( 'Checking if compiler is C11 ...' ) -+ ret = context.TryLink(""" -+ #if (__STDC_VERSION__ < 201112L) -+ #error Not C11 -+ #endif -+ int main(int argc, char **argv) { -+ return 0; -+ } -+ """,'.c') -+ context.Result(ret) -+ return ret -+ - def GetLoadPath(context): - context.Message("Getting system load path ...") - -@@ -491,6 +505,7 @@ else: - 'CheckXsltproc' : CheckXsltproc, - 'CheckCompilerOption' : CheckCompilerOption, - 'CheckCompilerDefines' : CheckCompilerDefines, -+ 'CheckC11' : CheckC11, - 'CheckHeaderDefines' : CheckHeaderDefines}) - - -@@ -633,7 +648,9 @@ else: - announce("You do not have kernel CANbus available.") - env["nmea2000"] = False - -- if not config.CheckCompilerDefines("__STDC_NO_ATOMICS__") and config.CheckHeader("stdatomic.h"): -+ # check for C11 or better, and __STDC__NO_ATOMICS__ is no defined -+ # before looking for stdatomic.h -+ if not config.CheckC11() and not config.CheckCompilerDefines("__STDC_NO_ATOMICS__") and config.CheckHeader("stdatomic.h"): - confdefs.append("#define HAVE_STDATOMIC_H 1\n") - else: - confdefs.append("/* #undef HAVE_STDATOMIC_H */\n") --- -2.1.0 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch b/recipes-navigation/gpsd/gpsd-3.16/0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch deleted file mode 100644 index 8bb0928..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 674c50ee54fd7cd304e8b3c4b33d3ff1272ed191 Mon Sep 17 00:00:00 2001 -From: "Gary E. Miller" <gem@rellim.com> -Date: Sun, 15 Mar 2015 12:17:51 -0700 -Subject: [PATCH 3/3] Whoops, check for C11, not for not C11 in stdatomic.h - test. - ---- - SConstruct | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SConstruct b/SConstruct -index faa8651..f4ea145 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -650,7 +650,7 @@ else: - - # check for C11 or better, and __STDC__NO_ATOMICS__ is no defined - # before looking for stdatomic.h -- if not config.CheckC11() and not config.CheckCompilerDefines("__STDC_NO_ATOMICS__") and config.CheckHeader("stdatomic.h"): -+ if config.CheckC11() and not config.CheckCompilerDefines("__STDC_NO_ATOMICS__") and config.CheckHeader("stdatomic.h"): - confdefs.append("#define HAVE_STDATOMIC_H 1\n") - else: - confdefs.append("/* #undef HAVE_STDATOMIC_H */\n") --- -2.1.0 - |