if conf.env['CXX_NAME'] == 'gcc':
gcc = conf.env['CC_VERSION']
- if int(gcc[0]) >= 4 and int(gcc[1]) > 1:
- conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
if int(gcc[0]) >= 8:
# I tried and failed to ignore these with _Pragma
conf.env.append_value('CXXFLAGS', ['-Wno-cast-function-type'])
- if int(gcc[0]) >= 9:
- conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy'])
have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1
+ # Most gccs still give these warnings from boost::optional
+ conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized'])
else:
have_c11 = False
if conf.env.TARGET_LINUX:
conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
- conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
+ conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share"' % conf.env['INSTALL_PREFIX'])
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
# OSX
if conf.env.TARGET_OSX:
- conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX', '-Wno-unused-function', '-Wno-unused-parameter', '-Wno-unused-local-typedef', '-Wno-potentially-evaluated-expression'])
+ conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_OSX'])
conf.env.append_value('LINKFLAGS', '-headerpad_max_install_names')
- else:
- # Avoid the endless warnings about _t uninitialized in optional<>
- conf.env.append_value('CXXFLAGS', '-Wno-maybe-uninitialized')
#
# Dependencies.
if conf.options.workaround_gssapi:
conf.env.LIB_SSH = ['gssapi_krb5']
else:
- conf.check_cc(fragment="""
+ conf.check_cxx(fragment="""
#include <libssh/libssh.h>\n
int main () {\n
ssh_new ();\n
conf.check_cxx(fragment="""
#include <boost/thread.hpp>\n
- int main() { boost::thread t (); }\n
+ int main() { boost::thread t; }\n
""",
msg='Checking for boost threading library',
libpath='/usr/local/lib',
#include <boost/process.hpp>\n
int main() { new boost::process::child("foo"); }\n
""",
+ cxxflags='-Wno-unused-parameter',
msg='Checking for boost process library',
lib=deps,
uselib_store='BOOST_PROCESS')