diff options
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd/gpsd')
4 files changed, 0 insertions, 145 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch deleted file mode 100644 index 6b720a5233..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-respect-sysroot-setting-when-prepending-L.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7427bb23092b3e395d14e42cd3b64691082fe826 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 10:58:26 +0200 -Subject: [PATCH 1/4] SConstruct: respect sysroot setting when prepending - LIBPATH/RPATH - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - SConstruct | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 22bc9f4..21b2205 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -269,9 +269,14 @@ def installdir(dir, add_destdir=True): - return wrapped - - # Honor the specified installation prefix in link paths. --env.Prepend(LIBPATH=[installdir('libdir')]) --if env["shared"]: -- env.Prepend(RPATH=[installdir('libdir')]) -+if env['sysroot']: -+ env.Prepend(LIBPATH=[os.path.normpath("%s/%s/%s" % (env['sysroot'], env['prefix'], env['libdir']))]) -+ if env["shared"]: -+ env.Prepend(RPATH=[os.path.normpath("%s/%s/%s" % (env['sysroot'], env['prefix'], env['libdir']))]) -+else: -+ env.Prepend(LIBPATH=[installdir('libdir')]) -+ if env["shared"]: -+ env.Prepend(RPATH=[installdir('libdir')]) - - # Give deheader a way to set compiler flags - if 'MORECFLAGS' in os.environ: --- -1.7.8.5 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch deleted file mode 100644 index 55ef7042d9..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5266eb72cbc8193faa2345b8774b0f159e61c067 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 11:52:35 +0200 -Subject: [PATCH 2/4] SConstruct: respect sysroot also in SPLINTOPTS - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - SConstruct | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 21b2205..0cf5799 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1224,7 +1224,10 @@ def Utility(target, source, action): - - # Report splint warnings - # Note: test_bits.c is unsplintable because of the PRI64 macros. --env['SPLINTOPTS'] = "-I/usr/include/libusb-1.0 +quiet" -+if env['sysroot']: -+ env['SPLINTOPTS'] = "-I%s/usr/include/libusb-1.0 +quiet" % env['sysroot'] -+else: -+ env['SPLINTOPTS'] = "-I/usr/include/libusb-1.0 +quiet" - - def Splint(target,sources, description, params): - return Utility(target,sources+generated_sources,[ --- -1.7.8.5 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0003-Revert-The-strptime-prototype-is-not-provided-unless.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0003-Revert-The-strptime-prototype-is-not-provided-unless.patch deleted file mode 100644 index c2d191c850..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0003-Revert-The-strptime-prototype-is-not-provided-unless.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c6bb11767172407bfaaebd962b4d12cd8e8a1fb0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 14:57:04 +0200 -Subject: [PATCH 3/4] Revert "The strptime prototype is not provided unless - explicitly requested." - -* This reverts commit 615d3eb14ea4833ce38ea89ec385308f4f679b33. -* with _XOPEN_SOURCE defined, we don't have - CLOCK_REALTIME and timespec defined and build fails: - | arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/shr-core/tmp-eglibc/sysroots/om-gta02 -o gpsutils.os -c -O2 -pipe -g -feliminate-unused-debug-types --sysroot=/OE/shr-core/tmp-eglibc/sysroots/om-gta02 -O2 -fPIC gpsutils.c - | gpsutils.c: In function 'timestamp': - | gpsutils.c:299:22: error: storage size of 'ts' isn't known - | gpsutils.c:300:34: error: 'CLOCK_REALTIME' undeclared (first use in this function) - | gpsutils.c:300:34: note: each undeclared identifier is reported only once for each function it appears in - | gpsutils.c: In function 'unix_to_iso8601': - | gpsutils.c:385:11: warning: incompatible implicit declaration of built-in function 'snprintf' [enabled by default] ---- - gpsutils.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/gpsutils.c b/gpsutils.c -index 60c4ae9..a1530ec 100644 ---- a/gpsutils.c -+++ b/gpsutils.c -@@ -3,11 +3,6 @@ - * This file is Copyright (c) 2010 by the GPSD project - * BSD terms apply: see the file COPYING in the distribution root for details. - */ -- --/* The strptime prototype is not provided unless explicitly requested. -- * So add the define that POSIX says to to avoid: */ --#define _XOPEN_SOURCE -- - #include <stdio.h> - #include <time.h> - #include <sys/time.h> --- -1.7.8.5 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath.patch deleted file mode 100644 index add624b826..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0004-SConstruct-remove-rpath.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b59f8c5bf8519a5ca114696e79b8690ebb68e0d3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 16:24:35 +0200 -Subject: [PATCH 4/4] SConstruct: remove rpath - -* even with correct prefix (without DESTDIR) included it's redundant - WARNING: QA Issue: libgps: - /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 - contains probably-redundant RPATH /usr/lib -* and with prefix from scons.bbclass it's invalid - WARNING: QA Issue: package libgps contains bad RPATH - /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib - in file - /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - SConstruct | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 0cf5799..3c919fc 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1152,8 +1152,11 @@ if qt_env: - - # We don't use installdir here in order to avoid having DESTDIR affect the rpath - if env["shared"]: -- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ -- % (installdir('libdir', False), )) -+ if env['sysroot']: -+ env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"') -+ else: -+ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (installdir('libdir', False), )) - - if not env['debug'] and not env['profiling'] and env['strip']: - env.AddPostAction(binaryinstall, '$STRIP $TARGET') --- -1.7.8.5 - |