From ad0427576903b002193afd3eef0cbb40d768129c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 7 Sep 2018 16:40:44 +0200 Subject: [PATCH] wafsamba: remove tru64cc.py as it's not compatible with waf 2 third_party/waf/waflib/Tools/compiler_c.py proposed gcc for osf1V/Tru64. If there's more needed on Tru64 someone with a Tru64 box needs to provide a waf 2 compatible fix. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Sep 10 22:49:31 CEST 2018 on sn-devel-144 --- buildtools/wafsamba/tru64cc.py | 77 ----------------------------------------- buildtools/wafsamba/wafsamba.py | 1 - 2 files changed, 78 deletions(-) delete mode 100644 buildtools/wafsamba/tru64cc.py diff --git a/buildtools/wafsamba/tru64cc.py b/buildtools/wafsamba/tru64cc.py deleted file mode 100644 index 28b560f7697..00000000000 --- a/buildtools/wafsamba/tru64cc.py +++ /dev/null @@ -1,77 +0,0 @@ - -# compiler definition for tru64/OSF1 cc compiler -# based on suncc.py from waf - -import os, optparse -from waflib import Utils, Options, Configure -from waflib.Tools import ccroot, ar -from waflib.Configure import conftest - -from waflib.Tools.compiler_c import c_compiler - -c_compiler['osf1V'] = ['gcc', 'tru64cc'] - -@conftest -def find_tru64cc(conf): - v = conf.env - cc = None - if v['CC']: cc = v['CC'] - elif 'CC' in conf.environ: cc = conf.environ['CC'] - if not cc: cc = conf.find_program('cc', var='CC') - if not cc: conf.fatal('tru64cc was not found') - cc = conf.cmd_to_list(cc) - - try: - if not Utils.cmd_output(cc + ['-V']): - conf.fatal('tru64cc %r was not found' % cc) - except ValueError: - conf.fatal('tru64cc -V could not be executed') - - v['CC'] = cc - v['CC_NAME'] = 'tru64' - -@conftest -def tru64cc_common_flags(conf): - v = conf.env - - v['CC_SRC_F'] = '' - v['CC_TGT_F'] = ['-c', '-o', ''] - v['CPPPATH_ST'] = '-I%s' # template for adding include paths - - # linker - if not v['LINK_CC']: v['LINK_CC'] = v['CC'] - v['CCLNK_SRC_F'] = '' - v['CCLNK_TGT_F'] = ['-o', ''] - - v['LIB_ST'] = '-l%s' # template for adding libs - v['LIBPATH_ST'] = '-L%s' # template for adding libpaths - v['STATICLIB_ST'] = '-l%s' - v['STATICLIBPATH_ST'] = '-L%s' - v['CCDEFINES_ST'] = '-D%s' - -# v['SONAME_ST'] = '-Wl,-h -Wl,%s' -# v['SHLIB_MARKER'] = '-Bdynamic' -# v['STATICLIB_MARKER'] = '-Bstatic' - - # program - v['program_PATTERN'] = '%s' - - # shared library -# v['shlib_CCFLAGS'] = ['-Kpic', '-DPIC'] - v['shlib_LINKFLAGS'] = ['-shared'] - v['shlib_PATTERN'] = 'lib%s.so' - - # static lib -# v['staticlib_LINKFLAGS'] = ['-Bstatic'] -# v['staticlib_PATTERN'] = 'lib%s.a' - -detect = ''' -find_tru64cc -find_cpp -find_ar -tru64cc_common_flags -cc_load_tools -cc_add_flags -link_add_flags -''' - diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 58b20d395f8..d6754e9127c 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -25,7 +25,6 @@ import samba_install import samba_conftests import samba_abi import samba_headers -import tru64cc import generic_cc import samba_dist import samba_wildcard -- 2.11.4.GIT