The branch, master has been updated
via a3adad7 waf: Fix the build on openbsd
from 3c2cf5e gpfs: Add include guard to gpfswrap.h
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a3adad7a1799703c6620d7e6590321d796291831
Author: Volker Lendecke <[email protected]>
Date: Mon Feb 2 21:08:25 2015 +0100
waf: Fix the build on openbsd
We have single-digit vnum='0', make the assignment deal with it
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Tue Mar 3 03:33:24 CET 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafadmin/Tools/ccroot.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafadmin/Tools/ccroot.py
b/buildtools/wafadmin/Tools/ccroot.py
index d59cf26..12ef442 100644
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/buildtools/wafadmin/Tools/ccroot.py
@@ -184,7 +184,9 @@ def get_target_name(self):
# 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])
+ pattern = '%s.%s' % (pattern, nums[0])
+ if len(nums) >= 2:
+ pattern += '.%s' % nums[1]
return os.path.join(dir, pattern % name)
--
Samba Shared Repository
