From 3486548ab4c83e4bd94069dd9a0ec008f6ae6ff3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 2 Feb 2015 21:08:25 +0100 Subject: [PATCH 1/2] waf: Fix the build on openbsd We have single-digit vnum='0', make the assignment deal with it Signed-off-by: Volker Lendecke Reviewed-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Tue Mar 3 03:33:24 CET 2015 on sn-devel-104 (cherry picked from commit a3adad7a1799703c6620d7e6590321d796291831) BUG: https://bugzilla.samba.org/show_bug.cgi?id=10476 --- buildtools/wafadmin/Tools/ccroot.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- 2.1.0 From 1cdf03b80adf4bf20984e10b1cab05efd70af752 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 3 Mar 2015 13:33:10 +0100 Subject: [PATCH 2/2] build:wafadmin: fix use of spaces instead of tabs. Indentation should not be a mixture of tabs and spaces. Waf uses tabs. Signed-off-by: Michael Adam Reviewed-by: David Disseldorp (cherry picked from commit 1826f06be7b286c8e343f272766fdb81a930013f) BUG: https://bugzilla.samba.org/show_bug.cgi?id=10476 --- buildtools/wafadmin/Tools/ccroot.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py index 12ef442..25c5179 100644 --- a/buildtools/wafadmin/Tools/ccroot.py +++ b/buildtools/wafadmin/Tools/ccroot.py @@ -184,9 +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' % (pattern, nums[0]) - if len(nums) >= 2: - pattern += '.%s' % nums[1] + pattern = '%s.%s' % (pattern, nums[0]) + if len(nums) >= 2: + pattern += '.%s' % nums[1] return os.path.join(dir, pattern % name) -- 2.1.0