diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2012-08-07 11:08:50 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-20 10:02:09 +0200 |
commit | 334b5198e12e95f69af4772c0c2f8e512d63451b (patch) | |
tree | 9e49c0acbb06b0c5ea5dc4cd17fe366f8e1204fe /meta-oe/recipes-navigation/gpsd/gpsd | |
parent | 5fd2b71ccab54b0717ebed21869754de16bd3608 (diff) | |
download | meta-openembedded-334b5198e12e95f69af4772c0c2f8e512d63451b.tar.gz |
gpsd: update to 3.7, drop older 3.5 and git recipe
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd/gpsd')
6 files changed, 0 insertions, 266 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch deleted file mode 100644 index 9db24326cf..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca1a781afbd68697ef2f573557f1f93ec7ab8d3c Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 29 Apr 2012 00:05:59 +0200 -Subject: [PATCH] SConstruct: disable html and man docs building because - xmlto-native from OE is broken - -It will try to load dtd and fail: -| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 -| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3) -| xmlto: Fix document syntax or use --skip-validation option -| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -| ^ -| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate -| mv: cannot stat `gpsctl.1': No such file or directory -| scons: *** [gpsctl.1] Error 1 -| scons: building terminated because of errors. - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - SConstruct | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 9c0f751..8236abb 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -560,12 +560,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); - - - manbuilder = mangenerator = htmlbuilder = None --if config.CheckXsltproc(): -+if False and config.CheckXsltproc(): - mangenerator = 'xsltproc' - build = "xsltproc --nonet %s $SOURCE >$TARGET" - htmlbuilder = build % docbook_html_uri - manbuilder = build % docbook_man_uri --elif WhereIs("xmlto"): -+elif False and WhereIs("xmlto"): - mangenerator = 'xmlto' - htmlbuilder = "xmlto html-nochunks $SOURCE; mv `basename $TARGET` $TARGET" - manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET" --- -1.7.8.6 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index c6eb03bf2f..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,72 +0,0 @@ -From dd3ca38b27cce93f7e932abaa27b41371234fa90 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 18:45:14 +0200 -Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot - from python_lib_dir - -* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix - and with PYTHONPATH from OE it's pointing to native python dir - - $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/ - $ python - Python 2.7.2 (default, Apr 18 2012, 09:19:59) - [GCC 4.6.2] on linux2 - Type "help", "copyright", "credits" or "license" for more information. - >>> from distutils import sysconfig - >>> sysconfig.get_config_vars('INCLUDEPY') - ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] - >>> - $ unset PYTHONPATH - $ python - Python 2.7.2 (default, Apr 18 2012, 09:19:59) - [GCC 4.6.2] on linux2 - Type "help", "copyright", "credits" or "license" for more information. - >>> from distutils import sysconfig - >>> sysconfig.get_config_vars('INCLUDEPY') - ['/python2.7'] - >>> import sysconfig - >>> sysconfig.get_config_vars('INCLUDEPY') - ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] -* python_lib_dir = python_lib_dir.replace(env['sysroot'], '') - returns path to target sysroot - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - SConstruct | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 3c919fc..8478181 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -932,6 +932,12 @@ else: - if vars[i] is None: - vars[i] = [] - (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy, ldflags) = vars -+ -+ if env['sysroot']: -+ print "Prefixing includepy '%s' with sysroot prefix" % includepy -+ includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy)) -+ print "'%s'" % includepy -+ - # in case CC/CXX was set to the scan-build wrapper, - # ensure that we build the python modules with scan-build, too - if env['CC'] is None or env['CC'].find('scan-build') < 0: -@@ -1165,11 +1171,14 @@ if not env['python']: - python_install = [] - else: - python_lib_dir = sysconfig.get_python_lib(plat_specific=1) -+ python_lib_dir = python_lib_dir.replace(env['sysroot'], '') - python_module_dir = python_lib_dir + os.sep + 'gps' - python_extensions_install = python_env.Install( DESTDIR + python_module_dir, - python_built_extensions) - if not env['debug'] and not env['profiling'] and env['strip']: - python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') -+ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (python_lib_dir, )) - - python_modules_install = python_env.Install( DESTDIR + python_module_dir, - python_modules) --- -1.7.8.5 - 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 - |