diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-04-05 17:39:08 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-04-05 17:39:08 -0400 |
| commit | 8a76425e5f7bc112647adf520ff88ac779b2816b (patch) | |
| tree | 5d485f63c4b53b9e08a6976c3beac78c2ac634b1 | |
| parent | 4141cd4d9c591bc0249ce04ec60b3d09f8613746 (diff) | |
| download | gpsd-8a76425e5f7bc112647adf520ff88ac779b2816b.tar.gz | |
Use -pthread instead of trying to link libpthreads, for OpenBSD portability.
| -rw-r--r-- | SConstruct | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -260,14 +260,6 @@ else: confdefs.append("/* #undef HAVE_LIBUSB */\n\n") usblibs = [] -if config.CheckLib('libpthread'): - confdefs.append("#define HAVE_LIBPTHREAD 1\n\n") - # System library - no special flags - pthreadlibs = ["pthread"] -else: - confdefs.append("/* #undef HAVE_LIBPTHREAD */\n\n") - pthreadlibs = [] - if config.CheckLib('librt'): confdefs.append("#define HAVE_LIBRT 1\n\n") # System library - no special flags @@ -496,9 +488,10 @@ gpsmon_sources = [ ## Production programs gpsd = env.Program('gpsd', gpsd_sources, - LIBS = gpsdlibs + pthreadlibs + rtlibs + dbus_xmit_libs) -gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], LIBS=gpsdlibs+pthreadlibs+rtlibs) -gpsctl = env.Program('gpsctl', ['gpsctl.c'], LIBS=gpsdlibs+pthreadlibs+rtlibs) + CFLAGS = "-pthread", + LIBS = gpsdlibs + rtlibs + dbus_xmit_libs) +gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], LIBS=gpsdlibs+rtlibs) +gpsctl = env.Program('gpsctl', ['gpsctl.c'], LIBS=gpsdlibs+rtlibs) gpsmon = env.Program('gpsmon', gpsmon_sources, LIBS=gpsdlibs + ncurseslibs) gpspipe = env.Program('gpspipe', ['gpspipe.c'], LIBS=gpslibs) gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], LIBS=gpslibs+dbus_recv_libs) |