forked from Lainports/freebsd-ports
71 lines
1.9 KiB
Text
71 lines
1.9 KiB
Text
--- SConstruct.orig Tue Aug 7 08:35:47 2007
|
|
+++ SConstruct Mon Aug 20 14:43:47 2007
|
|
@@ -1,12 +1,12 @@
|
|
EnsureSConsVersion(0,14);
|
|
#EnsurePythonVersion(2,1); this is buggy in scons, so i commented this out
|
|
|
|
-import os;
|
|
-import string;
|
|
+import os
|
|
+import string
|
|
import sys
|
|
|
|
-import detect;
|
|
-import methods;
|
|
+import detect
|
|
+import methods
|
|
|
|
moc_binary = "moc"
|
|
|
|
@@ -55,8 +55,10 @@
|
|
env.make_so = None
|
|
env.detect = detect.Detect()
|
|
|
|
-if os.environ.has_key('DISTCC_HOSTS'):
|
|
+if os.environ.has_key('CXX'):
|
|
env['CXX'] = os.environ['CXX']
|
|
+
|
|
+if os.environ.has_key('DISTCC_HOSTS'):
|
|
env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
|
|
env['ENV']['HOME'] = os.environ['HOME']
|
|
|
|
@@ -85,16 +87,16 @@
|
|
|
|
if (env.detect.need_gmp):
|
|
env.Append(CXXFLAGS=['-DNEED_GMP']);
|
|
- env.Append(LIBS=['-lgmp']);
|
|
+ env.Append(LIBS=['gmp']);
|
|
if (env.detect.have_libaudiofile):
|
|
- env.Append(LIBS=['-laudiofile']);
|
|
+ env.Append(LIBS=['audiofile']);
|
|
env.Append(CXXFLAGS=['-DHAVE_LIBAUDIOFILE']);
|
|
if (env.detect.need_limit_macros_define) :
|
|
env.Append(CXXFLAGS=['-D__STDC_LIMIT_MACROS']);
|
|
if (env.detect.have_gnu_basename) :
|
|
env.Append(CXXFLAGS=['-DHAVE_GNU_BASENAME']);
|
|
-if (env.detect.have_xpg_basename) :
|
|
- env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']);
|
|
+#if (env.detect.have_xpg_basename) :
|
|
+# env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']);
|
|
if (env.detect.have_stdint_h) :
|
|
env.Append(CXXFLAGS=['-DHAVE_STDINT_H']);
|
|
if (env.detect.have_msint) :
|
|
@@ -103,7 +105,7 @@
|
|
env.Append(CXXFLAGS=['-DHAVE_MMAP']);
|
|
if (env.detect.have_madvise) :
|
|
env.Append(CXXFLAGS=['-DHAVE_MADVISE']);
|
|
-env.Append(CXXFLAGS=['-g','-Wall']);
|
|
+env.Append(CXXFLAGS="%%CXXFLAGS%% %%PTHREAD_CFLAGS%%");
|
|
|
|
if os.environ.has_key('USE_STACK_CHECK'):
|
|
env.Append(CXXFLAGS=['-fstack-check']);
|
|
@@ -159,7 +161,8 @@
|
|
|
|
|
|
|
|
-env.Append(LIBS=['z','m','pthread']);
|
|
+env.Append(LIBS=['z','m']);
|
|
+env.Append(LINKFLAGS=["%%PTHREAD_LIBS%%"]);
|
|
|
|
|
|
|