From e960ec23a31247a508a529cd0b2c4979802bbbcc Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 17 Mar 2012 19:17:27 +0100
Subject: gpsd ajout patch link

---
 gpsd/.md5sum.i686        |  1 +
 gpsd/.md5sum.x86_64      |  1 +
 gpsd/Pkgfile             |  7 +++++--
 gpsd/gpsd-3.4-link.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 gpsd/gpsd-3.4-link.patch

(limited to 'gpsd')

diff --git a/gpsd/.md5sum.i686 b/gpsd/.md5sum.i686
index e1e14186e..d83bfce48 100644
--- a/gpsd/.md5sum.i686
+++ b/gpsd/.md5sum.i686
@@ -1,3 +1,4 @@
+91c58a5fb60d5d6ffe7cc0caebd4e31e  gpsd-3.4-link.patch
 c01353459faa68834309109d4e868460  gpsd-3.4.tar.gz
 3e963df3f9f7ef3572ecc648ae829315  gpsd.conf
 0a08402de902050802cd6f5e2eb36fc2  gpsd.rc
diff --git a/gpsd/.md5sum.x86_64 b/gpsd/.md5sum.x86_64
index e1e14186e..d83bfce48 100644
--- a/gpsd/.md5sum.x86_64
+++ b/gpsd/.md5sum.x86_64
@@ -1,3 +1,4 @@
+91c58a5fb60d5d6ffe7cc0caebd4e31e  gpsd-3.4-link.patch
 c01353459faa68834309109d4e868460  gpsd-3.4.tar.gz
 3e963df3f9f7ef3572ecc648ae829315  gpsd.conf
 0a08402de902050802cd6f5e2eb36fc2  gpsd.rc
diff --git a/gpsd/Pkgfile b/gpsd/Pkgfile
index ffb75dc7c..93794a5ea 100644
--- a/gpsd/Pkgfile
+++ b/gpsd/Pkgfile
@@ -7,13 +7,16 @@
 
 name=gpsd
 version=3.4
-release=1
+release=2
 source=(http://download-mirror.savannah.gnu.org/releases/$name/$name-$version.tar.gz
 	gpsd.conf
-	gpsd.rc)
+	gpsd.rc
+	gpsd-3.4-link.patch)
 
 build() {
 	cd $name-$version
+
+	patch -p0 < ../gpsd-3.4-link.patch
 	# Correction de chemins pour Python2.7
 	sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find . -name '*.py')
 	sed -i "s|/usr/bin/env python|/usr/bin/env python2|" gegps gpscat gpsfake gpsprof xgps xgpsspeed
diff --git a/gpsd/gpsd-3.4-link.patch b/gpsd/gpsd-3.4-link.patch
new file mode 100644
index 000000000..05604eb54
--- /dev/null
+++ b/gpsd/gpsd-3.4-link.patch
@@ -0,0 +1,54 @@
+--- SConstruct.link	2011-10-29 13:48:53.000000000 +0200
++++ SConstruct	2012-01-02 12:18:38.400921746 +0100
+@@ -768,7 +768,7 @@
+                            target="gpsd",
+                            sources=libgpsd_sources,
+                            version=libgps_version,
+-                           parse_flags=usblibs + rtlibs + bluezlibs)
++                           parse_flags=usblibs + bluezlibs + ['-lgps', '-lm'])
+ 
+ libraries = [compiled_gpslib, compiled_gpsdlib]
+ 
+@@ -792,8 +792,8 @@
+         qtobjects.append(qt_env.SharedObject(src.split(".")[0] + '-qt', src,
+                                              CC=compile_with,
+                                              CFLAGS=compile_flags,
+-                                             parse_flags=dbus_libs))
+-    compiled_qgpsmmlib = Library(qt_env, "Qgpsmm", qtobjects, libgps_version)
++                                             parse_flags=dbus_libs + ['-lgps']))
++    compiled_qgpsmmlib = Library(qt_env, "Qgpsmm", qtobjects, libgps_version, parse_flags=dbus_libs + ['-lgps'])
+     libraries.append(compiled_qgpsmmlib)
+ 
+ # The libraries have dependencies on system libraries
+@@ -830,8 +830,7 @@
+ # distributions don't do implicit linking by design. See the test
+ # code for implicit_link.
+ #
+-if not env['shared'] or not env["implicit_link"]:
+-    env.MergeFlags("-lm")
++env.MergeFlags("-lm")
+ 
+ gpsd_env = env.Clone()
+ gpsd_env.MergeFlags("-pthread")
+@@ -912,11 +912,11 @@
+     }
+ 
+     python_env = env.Clone()
+-    vars = sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY')
++    vars = sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO', 'VERSION', 'INCLUDEPY')
+     for i in range(len(vars)):
+         if vars[i] is None:
+             vars[i] = ""
+-    (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy) = vars
++    (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, pyver, includepy) = vars
+     # 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:
+@@ -934,6 +934,7 @@
+     python_env['SHLIBSUFFIX']=so_ext
+     python_env['CPPPATH'] =[includepy]
+     python_env['CPPFLAGS']=basecflags + " " + opt
++    python_env['LIBS'] = ['python'+pyver, 'm']
+     python_objects={}
+     python_compiled_libs = {}
+     for ext, sources in python_extensions.iteritems():
-- 
cgit v1.2.3-54-g00ecf