diff options
Diffstat (limited to 'gpsd/gpsd-3.4-link.patch')
| -rw-r--r-- | gpsd/gpsd-3.4-link.patch | 54 |
1 files changed, 54 insertions, 0 deletions
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(): |