[gpsd] fix some undefined-non-weak-symbols warnings

Miroslav Lichvar mlichvar at fedoraproject.org
Tue Aug 30 13:13:13 UTC 2011


commit ea491497c02324da09d1af7cd1e096aed2ac7a36
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Tue Aug 30 15:10:53 2011 +0200

    fix some undefined-non-weak-symbols warnings

 gpsd-scons.patch |    9 +++++++++
 gpsd.spec        |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/gpsd-scons.patch b/gpsd-scons.patch
index 41de621..852e0d7 100644
--- a/gpsd-scons.patch
+++ b/gpsd-scons.patch
@@ -24,6 +24,15 @@ diff -up gpsd-3.1/SConstruct.scons gpsd-3.1/SConstruct
  
  # Map options to libraries required to support them that might be absent.
  optionrequires = {
+@@ -686,7 +685,7 @@ compiled_gpslib = Library(env=env,
+ compiled_gpsdlib = Library(env=env,
+                            target="gpsd",
+                            sources=libgpsd_sources,
+-                           version=libversion, parse_flags=usblibs + rtlibs + bluezlibs)
++                           version=libversion, parse_flags=usblibs + bluezlibs + [ "-lm", "-lgps"])
+ 
+ libraries = [compiled_gpslib, compiled_gpsdlib]
+ 
 @@ -896,7 +895,7 @@ if st != 0:
      from datetime import datetime
      rev = datetime.now().isoformat()[:-4]
diff --git a/gpsd.spec b/gpsd.spec
index 82102ec..1395009 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -10,7 +10,7 @@ Source0: http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
 Source10: gpsd.service
 Source11: gpsd.sysconfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# fix RPATH, CFLAGS and revision.h
+# fix RPATH, libs and revision.h
 Patch0:   gpsd-scons.patch
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel


More information about the scm-commits mailing list