wafsamba: remove hpuxcc.py as it's not compatible with waf 2

third_party/waf/waflib/Tools/compiler_c.py proposed
gcc for HPUX.

If there's more needed on HPUX someone with a HPUX box needs to
provide a waf 2 compatible fix.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/wafsamba/hpuxcc.py b/buildtools/wafsamba/hpuxcc.py
deleted file mode 100644 (file)
index 5938811..0000000
--- a/buildtools/wafsamba/hpuxcc.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# compiler definition for HPUX
-# based on suncc.py from waf
-
-import os, optparse, sys
-from waflib import Utils, Options, Configure
-from waflib.Tools import ccroot, ar
-from waflib.Configure import conftest
-from waflib.Tools import gcc
-
-
-@conftest
-def gcc_modifier_hpux(conf):
-    v=conf.env
-    v['CCFLAGS_DEBUG']=['-g']
-    v['CCFLAGS_RELEASE']=['-O2']
-    v['CC_SRC_F']=''
-    v['CC_TGT_F']=['-c','-o','']
-    v['CPPPATH_ST']='-I%s'
-    if not v['LINK_CC']:v['LINK_CC']=v['CC']
-    v['CCLNK_SRC_F']=''
-    v['CCLNK_TGT_F']=['-o','']
-    v['LIB_ST']='-l%s'
-    v['LIBPATH_ST']='-L%s'
-    v['STATICLIB_ST']='-l%s'
-    v['STATICLIBPATH_ST']='-L%s'
-    v['RPATH_ST']='-Wl,-rpath,%s'
-    v['CCDEFINES_ST']='-D%s'
-    v['SONAME_ST']='-Wl,-h,%s'
-    v['SHLIB_MARKER']=[]
-#    v['STATICLIB_MARKER']='-Wl,-Bstatic'
-    v['FULLSTATIC_MARKER']='-static'
-    v['program_PATTERN']='%s'
-    v['shlib_CCFLAGS']=['-fPIC','-DPIC']
-    v['shlib_LINKFLAGS']=['-shared']
-    v['shlib_PATTERN']='lib%s.sl'
-#   v['staticlib_LINKFLAGS']=['-Wl,-Bstatic']
-    v['staticlib_PATTERN']='lib%s.a'
-
-gcc.gcc_modifier_hpux = gcc_modifier_hpux
-
-from waflib.TaskGen import feature, after
-@feature('cprogram', 'cshlib')
-@after('apply_link', 'apply_lib_vars', 'apply_obj_vars')
-def hpux_addfullpath(self):
-  if sys.platform == 'hp-ux11':
-    link = getattr(self, 'link_task', None)
-    if link:
-        lst = link.env.LINKFLAGS
-        buf = []
-        for x in lst:
-           if x.startswith('-L'):
-               p2 = x[2:]
-               if not os.path.isabs(p2):
-                   x = x[:2] + self.bld.srcnode.abspath(link.env) + "/../" + x[2:].lstrip('.')
-           buf.append(x)
-        link.env.LINKFLAGS = buf

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 33ae1fe566dab6f3d676cd8599dd30dc38afa2f8..58b20d395f83b3ea2abd356ad9f5e5c046e3fecd 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -26,7 +26,6 @@ import samba_conftests
 import samba_abi
 import samba_headers
 import tru64cc
-import hpuxcc
 import generic_cc
 import samba_dist
 import samba_wildcard