From 959e2e0532bb2562bbb00ff9f4921f80ac80ca1b Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Wed, 8 May 2019 16:41:36 +0200 Subject: [PATCH] [build] Fixes compilation of samples on *BSD. --- samples/asiotap/proxy/SConscript | 2 +- samples/asiotap/routes/SConscript | 2 +- samples/asiotap/tap/SConscript | 2 +- samples/asiotap/tun/SConscript | 2 +- samples/fscp/client/SConscript | 5 +---- samples/fscp/schat/SConscript | 6 +----- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/samples/asiotap/proxy/SConscript b/samples/asiotap/proxy/SConscript index 7b914a5e..b4dc01bb 100644 --- a/samples/asiotap/proxy/SConscript +++ b/samples/asiotap/proxy/SConscript @@ -7,10 +7,10 @@ libraries = [ 'executeplus', 'boost_system', 'boost_iostreams', + 'pthread' ] if sys.platform.startswith('linux'): - libraries.append('pthread') libraries.append('netlinkplus') Import('env dirs name') diff --git a/samples/asiotap/routes/SConscript b/samples/asiotap/routes/SConscript index c4a6d284..68f2f195 100644 --- a/samples/asiotap/routes/SConscript +++ b/samples/asiotap/routes/SConscript @@ -7,12 +7,12 @@ libraries = [ 'executeplus', 'boost_system', 'boost_iostreams', + 'pthread', ] if sys.platform.startswith('linux'): libraries.extend([ 'netlinkplus', - 'pthread', ]) Import('env dirs name') diff --git a/samples/asiotap/tap/SConscript b/samples/asiotap/tap/SConscript index 3da4bc39..b4dc01bb 100644 --- a/samples/asiotap/tap/SConscript +++ b/samples/asiotap/tap/SConscript @@ -7,11 +7,11 @@ libraries = [ 'executeplus', 'boost_system', 'boost_iostreams', + 'pthread' ] if sys.platform.startswith('linux'): libraries.append('netlinkplus') - libraries.append('pthread') Import('env dirs name') diff --git a/samples/asiotap/tun/SConscript b/samples/asiotap/tun/SConscript index 3da4bc39..b4dc01bb 100644 --- a/samples/asiotap/tun/SConscript +++ b/samples/asiotap/tun/SConscript @@ -7,11 +7,11 @@ libraries = [ 'executeplus', 'boost_system', 'boost_iostreams', + 'pthread' ] if sys.platform.startswith('linux'): libraries.append('netlinkplus') - libraries.append('pthread') Import('env dirs name') diff --git a/samples/fscp/client/SConscript b/samples/fscp/client/SConscript index 5f6f77f1..dec6a0c8 100644 --- a/samples/fscp/client/SConscript +++ b/samples/fscp/client/SConscript @@ -8,6 +8,7 @@ libraries = [ 'cryptoplus', 'boost_system', 'crypto', + 'pthread' ] if env.upnp == 'yes': @@ -27,10 +28,6 @@ else: 'boost_thread', ]) env = conf.Finish() -if sys.platform.startswith('linux'): - libraries.extend([ - 'pthread', - ]) env = env.Clone() env.Append(LIBS=libraries) diff --git a/samples/fscp/schat/SConscript b/samples/fscp/schat/SConscript index f5c4828c..dec6a0c8 100644 --- a/samples/fscp/schat/SConscript +++ b/samples/fscp/schat/SConscript @@ -8,6 +8,7 @@ libraries = [ 'cryptoplus', 'boost_system', 'crypto', + 'pthread' ] if env.upnp == 'yes': @@ -28,11 +29,6 @@ else: ]) env = conf.Finish() -if sys.platform.startswith('linux'): - libraries.extend([ - 'pthread', - ]) - env = env.Clone() env.Append(LIBS=libraries) samples = env.Program(target=os.path.join(str(dirs['bin']), name), source=env.RGlob('.', ['*.cpp']))