Lines 1-19
Link Here
|
1 |
--- SConstruct.orig 2015-03-14 11:24:41 UTC |
1 |
Remove LIBPATH='.' - see http://lists.nongnu.org/archive/html/gpsd-dev/2016-02/msg00042.html |
|
|
2 |
|
3 |
--- SConstruct.orig 2016-01-08 19:25:48 UTC |
2 |
+++ SConstruct |
4 |
+++ SConstruct |
3 |
@@ -305,16 +305,6 @@ def installdir(dir, add_destdir=True): |
5 |
@@ -985,37 +985,37 @@ gpsmon_sources = [ |
4 |
wrapped.replace("/usr/lib/systemd", "/lib/systemd") |
6 |
## Production programs |
5 |
return wrapped |
|
|
6 |
|
7 |
|
7 |
-# Honor the specified installation prefix in link paths. |
8 |
gpsd = env.Program('gpsd', gpsd_sources, |
8 |
-if env["sysroot"]: |
9 |
- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
9 |
- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)]) |
10 |
+ LIBS=['gpsd', 'gps_static'], |
10 |
- |
11 |
parse_flags=gpsdflags+gpsflags) |
11 |
-# Don't hack RPATH unless libdir points somewhere that is not on the |
12 |
gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], |
12 |
-# minimum default load path. |
13 |
- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
13 |
-if env["shared"]: |
14 |
+ LIBS=['gpsd', 'gps_static'], |
14 |
- if env["libdir"] not in ["/usr/lib", "/lib"]: |
15 |
parse_flags=gpsdflags+gpsflags) |
15 |
- env.Prepend(RPATH=[installdir('libdir')]) |
16 |
gpsctl = env.Program('gpsctl', ['gpsctl.c'], |
16 |
- |
17 |
- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
17 |
# Give deheader a way to set compiler flags |
18 |
+ LIBS=['gpsd', 'gps_static'], |
18 |
if 'MORECFLAGS' in os.environ: |
19 |
parse_flags=gpsdflags+gpsflags) |
19 |
env.Append(CFLAGS=Split(os.environ['MORECFLAGS'])) |
20 |
gpsmon = env.Program('gpsmon', gpsmon_sources, |
|
|
21 |
- LIBS=['gpsd', 'gps_static'], LIBPATH='.', |
22 |
+ LIBS=['gpsd', 'gps_static'], |
23 |
parse_flags=gpsdflags + gpsflags + ncurseslibs) |
24 |
gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], |
25 |
- LIBS=['gps_static'], LIBPATH='.', |
26 |
+ LIBS=['gps_static'], |
27 |
parse_flags=gpsflags) |
28 |
gpspipe = env.Program('gpspipe', ['gpspipe.c'], |
29 |
- LIBS=['gps_static'], LIBPATH='.', |
30 |
+ LIBS=['gps_static'], |
31 |
parse_flags=gpsflags) |
32 |
gps2udp = env.Program('gps2udp', ['gps2udp.c'], |
33 |
- LIBS=['gps_static'], LIBPATH='.', |
34 |
+ LIBS=['gps_static'], |
35 |
parse_flags=gpsflags) |
36 |
gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], |
37 |
- LIBS=['gps_static'], LIBPATH='.', |
38 |
+ LIBS=['gps_static'], |
39 |
parse_flags=gpsflags) |
40 |
lcdgps = env.Program('lcdgps', ['lcdgps.c'], |
41 |
- LIBS=['gps_static'], LIBPATH='.', |
42 |
+ LIBS=['gps_static'], |
43 |
parse_flags=gpsflags) |
44 |
cgps = env.Program('cgps', ['cgps.c'], |
45 |
- LIBS=['gps_static'], LIBPATH='.', |
46 |
+ LIBS=['gps_static'], |
47 |
parse_flags=gpsflags + ncurseslibs) |
48 |
ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], |
49 |
- LIBS=['gps_static'], LIBPATH='.', |
50 |
+ LIBS=['gps_static'], |
51 |
parse_flags=gpsflags) |
52 |
|
53 |
binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon] |
54 |
@@ -1024,26 +1024,26 @@ if env["ncurses"]: |
55 |
|
56 |
# Test programs - always link locally and statically |
57 |
test_bits = env.Program('test_bits', ['test_bits.c'], |
58 |
- LIBS=['gps_static'], LIBPATH='.') |
59 |
+ LIBS=['gps_static']) |
60 |
test_float = env.Program('test_float', ['test_float.c']) |
61 |
test_geoid = env.Program('test_geoid', ['test_geoid.c'], |
62 |
LIBS=['gpsd', 'gps_static'], |
63 |
- LIBPATH='.', parse_flags=gpsdflags) |
64 |
+ parse_flags=gpsdflags) |
65 |
test_matrix = env.Program('test_matrix', ['test_matrix.c'], |
66 |
LIBS=['gpsd', 'gps_static'], |
67 |
- LIBPATH='.', parse_flags=gpsdflags) |
68 |
+ parse_flags=gpsdflags) |
69 |
test_mktime = env.Program('test_mktime', ['test_mktime.c'], |
70 |
- LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"]) |
71 |
+ LIBS=['gps_static'], parse_flags=["-lm"]) |
72 |
test_packet = env.Program('test_packet', ['test_packet.c'], |
73 |
LIBS=['gpsd', 'gps_static'], |
74 |
- LIBPATH='.', parse_flags=gpsdflags) |
75 |
+ parse_flags=gpsdflags) |
76 |
test_timespec = env.Program('test_timespec', ['test_timespec.c'], |
77 |
LIBS=['gpsd', 'gps_static'], |
78 |
- LIBPATH='.', parse_flags=gpsdflags) |
79 |
+ parse_flags=gpsdflags) |
80 |
test_trig = env.Program('test_trig', ['test_trig.c'], parse_flags=["-lm"]) |
81 |
# test_libgps for glibc older than 2.17 |
82 |
test_libgps = env.Program('test_libgps', ['test_libgps.c'], |
83 |
- LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"] + rtlibs + dbusflags) |
84 |
+ LIBS=['gps_static'], parse_flags=["-lm"] + rtlibs + dbusflags) |
85 |
|
86 |
if not env['socket_export']: |
87 |
announce("test_json not building because socket_export is disabled") |
88 |
@@ -1051,11 +1051,11 @@ if not env['socket_export']: |
89 |
else: |
90 |
test_json = env.Program( |
91 |
'test_json', ['test_json.c'], |
92 |
- LIBS=['gps_static'], LIBPATH='.', |
93 |
+ LIBS=['gps_static'], |
94 |
parse_flags=["-lm"] + rtlibs + usbflags + dbusflags) |
95 |
|
96 |
test_gpsmm = env.Program('test_gpsmm', ['test_gpsmm.cpp'], |
97 |
- LIBS=['gps_static'], LIBPATH='.', parse_flags=["-lm"]) |
98 |
+ LIBS=['gps_static'], parse_flags=["-lm"]) |
99 |
testprogs = [test_bits, test_float, test_geoid, test_libgps, test_matrix, test_mktime, test_packet, test_timespec, test_trig] |
100 |
if env['socket_export']: |
101 |
testprogs.append(test_json) |