sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

wafadmin: backported the openbsd fixes from waf 1.7

Browse Source 
This is a backport from waf 1.5...

Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jan  9 02:02:07 CET 2015 on sn-devel-104
This commit is contained in:
Thomas Nagy 2013-09-17 00:00:40 +02:00 committed by Jeremy Allison
parent 9f2979a1a4
commit 115eb94215
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
buildtools/wafadmin/Tools/ccroot.py
View File

@ -177,10 +177,14 @@ def get_target_name(self):
dir, name = os.path.split(self.target)
if self.env.DEST_BINFMT == 'pe' and getattr(self, 'vnum', None) and 'cshlib' in self.features:
# include the version in the dll file name,
# the import lib file name stays unversionned.
name = name + '-' + self.vnum.split('.')[0]
if 'cshlib' in self.features and getattr(self, 'vnum', None):
nums = self.vnum.split('.')
if self.env.DEST_BINFMT == 'pe':
# include the version in the dll file name,
# the import lib file name stays unversionned.
name = name + '-' + nums[0]
elif self.env.DEST_OS == 'openbsd':
pattern = '%s.%s.%s' % (pattern, nums[0], nums[1])
return os.path.join(dir, pattern % name)
@ -598,14 +602,16 @@ def apply_vnum(self):
if not path: return
if self.env.DEST_OS == 'openbsd':
bld.install_as(path + os.sep + name2, node, env=self.env, chmod=self.link_task.chmod)
libname = self.link_task.outputs[0].name
bld.install_as('%s%s%s' % (path, os.sep, libname), node, env=self.env)
else:
bld.install_as(path + os.sep + name3, node, env=self.env)
bld.symlink_as(path + os.sep + name2, name3)
bld.symlink_as(path + os.sep + libname, name3)
# the following task is just to enable execution from the build dir :-/
self.create_task('vnum', node, [node.parent.find_or_declare(name2), node.parent.find_or_declare(name3)])
if self.env.DEST_OS != 'openbsd':
self.create_task('vnum', node, [node.parent.find_or_declare(name2), node.parent.find_or_declare(name3)])
def exec_vnum_link(self):
for x in self.outputs:

4
buildtools/wafadmin/Tools/gcc.py
View File

@ -113,6 +113,10 @@ def gcc_modifier_aix(conf):
v['SHLIB_MARKER'] = ''
@conftest
def gcc_modifier_openbsd(conf):
conf.env['SONAME_ST'] = []
@conftest
def gcc_modifier_platform(conf):
# * set configurations specific for a platform.

4
buildtools/wafadmin/Tools/gxx.py
View File

@ -111,6 +111,10 @@ def gxx_modifier_aix(conf):
v['SHLIB_MARKER'] = ''
@conftest
def gxx_modifier_openbsd(conf):
conf.env['SONAME_ST'] = []
@conftest
def gxx_modifier_platform(conf):
# * set configurations specific for a platform.