[build] Fixes compilation of samples on *BSD.

freelan-developers · May 8, 2019 · 959e2e0 · 959e2e0
1 parent b95cfc1
commit 959e2e0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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']))