waf: Fix the build on openbsd
authorVolker Lendecke <vl@samba.org>
Mon, 2 Feb 2015 20:08:25 +0000 (21:08 +0100)
committerKarolin Seeger <kseeger@samba.org>
Mon, 9 Mar 2015 21:01:08 +0000 (22:01 +0100)
We have single-digit vnum='0', make the assignment deal with it

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
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

index d59cf2663395a19f8b087f214834eef8705940c3..12ef4425210a5d2feb67b3b81611804ee9054fba 100644 (file)
@@ -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)