[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd-3.4-strptime.patch gpsd-3.4-gpsmon-lm.patch gpsd-3.4-cfgetispeed.patch gpsd-3.4-chrpath.patch

[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd-3.4-strptime.patch gpsd-3.4-gpsmon-lm.patch gpsd-3.4-cfgetispeed.patch gpsd-3.4-chrpath.patch

[Mike Frysinger (vapier)]

vapier      12/01/13 17:32:06

  Added:                gpsd-3.4-strptime.patch gpsd-3.4-gpsmon-lm.patch
                        gpsd-3.4-cfgetispeed.patch gpsd-3.4-chrpath.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.4-strptime.patch
===================================================================
From 083ee79e5b6acbd08008965cbca496eb61957fa4 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 13 Jan 2012 11:56:12 -0500
Subject: [PATCH] fix missing strptime prototype

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 gpsutils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gpsutils.c b/gpsutils.c
index a1530ec..cc47d52 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -3,6 +3,8 @@
  * This file is Copyright (c) 2010 by the GPSD project
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
+#define _XOPEN_SOURCE 700
+
 #include <stdio.h>
 #include <time.h>
 #include <sys/time.h>
-- 
1.7.8.3




1.1                  sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.4-gpsmon-lm.patch
===================================================================
From 55131187b6a0290f99d1dd70b5cce48040bba7bb Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 13 Jan 2012 11:53:39 -0500
Subject: [PATCH] gpsmon: always link with -lm

Since the gpsmon pkg uses math funcs itself (and not just via libgps),
we need to link in -lm for the app.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 SConstruct |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/SConstruct b/SConstruct
index 68bf367..a5249c1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -851,7 +851,7 @@ gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
 env.Depends(gpsdctl, compiled_gpslib)
 
 gpsmon = env.Program('gpsmon', gpsmon_sources,
-                     parse_flags=gpsdlibs + ncurseslibs)
+                     parse_flags=gpsdlibs + ncurseslibs + ['-lm'])
 env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib])
 
 gpspipe = env.Program('gpspipe', ['gpspipe.c'], parse_flags=gpslibs)
-- 
1.7.8.3




1.1                  sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.4-cfgetispeed.patch
===================================================================
From 38702bf0f4aaafdddde51393106eeaf720c1fc63 Mon Sep 17 00:00:00 2001
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Fri, 13 Jan 2012 11:59:55 -0500
Subject: [PATCH] serial: use cfgetispeed helpers

Rather than poking c_ispeed directly, use the cfgetispeed helper.  This
is part of POSIX, and we already use cfsetispeed, so there shouldn't be
any portability issues here.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 serial.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/serial.c b/serial.c
index c1464dd..8eb03ce 100644
--- a/serial.c
+++ b/serial.c
@@ -594,13 +594,8 @@ void gpsd_close(struct gps_device_t *session)
 	 * them the first time.  Economical, and avoids tripping over an
 	 * obscure Linux 2.6 kernel bug that disables threaded
 	 * ioctl(TIOCMWAIT) on a device after tcsetattr() is called.
-         *
-         * Unfortunately the termios struct doesn't have c_ispeed/c_ospeed
-         * on all architectures. Its missing on sparc, mips/mispel and hurd-i386 at least.
 	 */
-#if defined(_HAVE_STRUCT_TERMIOS_C_ISPEED)
-	if (session->ttyset_old.c_ispeed != session->ttyset.c_ispeed || (session->ttyset_old.c_cflag & CSTOPB) != (session->ttyset.c_cflag & CSTOPB)) {
-#endif
+	if (cfgetispeed(&session->ttyset_old) != cfgetispeed(&session->ttyset) || (session->ttyset_old.c_cflag & CSTOPB) != (session->ttyset.c_cflag & CSTOPB)) {
 	    /*@ ignore @*/
 	    (void)cfsetispeed(&session->ttyset_old,
 			      (speed_t) session->gpsdata.dev.baudrate);
@@ -609,9 +604,7 @@ void gpsd_close(struct gps_device_t *session)
 	    /*@ end @*/
 	    (void)tcsetattr(session->gpsdata.gps_fd, TCSANOW,
 			    &session->ttyset_old);
-#if defined(_HAVE_STRUCT_TERMIOS_C_ISPEED)
 	}
-#endif
 	gpsd_report(LOG_SPIN, "close(%d) in gpsd_close(%s)\n",
 		    session->gpsdata.gps_fd, session->gpsdata.dev.path);
 	(void)close(session->gpsdata.gps_fd);
-- 
1.7.8.3




1.1                  sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.4-chrpath.patch
===================================================================
From 63a44d0cb5494ed1078de411b55cb1c9a8307cec Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 18 Nov 2011 19:09:27 -0500
Subject: [PATCH] make chrpath optional

There's no reason to require chrpath for distributions who only want to
compile locally and then install elsewhere for packaging.  So allow them
to specify CHRPATH='' via the env to disable this requirement.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 SConstruct |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/SConstruct b/SConstruct
index ccaca7d..68bf367 100644
--- a/SConstruct
+++ b/SConstruct
@@ -270,7 +270,7 @@ def installdir(dir, add_destdir=True):
 
 # Honor the specified installation prefix in link paths.
 env.Prepend(LIBPATH=[installdir('libdir')])
-if env["shared"]:
+if env["shared"] and env['CHRPATH']:
     env.Prepend(RPATH=[installdir('libdir')])
 
 # Give deheader a way to set compiler flags
@@ -390,17 +390,18 @@ config = Configure(env, custom_tests = { 'CheckPKG' : CheckPKG,
                                          'CheckXsltproc' : CheckXsltproc})
 
 env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
-if config.CheckExecutable('$CHRPATH -v', 'chrpath'):
-    # Tell generated binaries to look in the current directory for
-    # shared libraries so we can run tests without hassle. Should be
-    # handled sanely by scons on all systems.  Not good to use '.' or
-    # a relative path here; it's a security risk.  At install time we
-    # use chrpath to edit this out of RPATH.
-    if env["shared"]:
-        env.Prepend(RPATH=[os.path.realpath(os.curdir)])
-else:
-    print "chrpath is not available, forcing static linking."
-    env["shared"] = False
+if env['CHRPATH']:
+    if config.CheckExecutable('$CHRPATH -v', 'chrpath'):
+        # Tell generated binaries to look in the current directory for
+        # shared libraries so we can run tests without hassle. Should be
+        # handled sanely by scons on all systems.  Not good to use '.' or
+        # a relative path here; it's a security risk.  At install time we
+        # use chrpath to edit this out of RPATH.
+        if env["shared"]:
+            env.Prepend(RPATH=[os.path.realpath(os.curdir)])
+    else:
+        print "chrpath is not available, forcing static linking."
+        env["shared"] = False
 
 confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]
 
@@ -1140,7 +1141,7 @@ if qt_env:
     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
 
 # We don't use installdir here in order to avoid having DESTDIR affect the rpath
-if env["shared"]:
+if env['CHRPATH']:
     env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
                       % (installdir('libdir', False), ))
 
-- 
1.7.8.3