Backport 0e97908 from WAF repository: symlink fix for OpenBSD
authorMatthieu Patou <mat@matws.net>
Sat, 7 Sep 2013 06:23:07 +0000 (23:23 -0700)
committerKai Blin <kai@samba.org>
Sat, 21 Sep 2013 09:14:30 +0000 (11:14 +0200)
Author: Thomas Nagy <tnagy1024@gmail.com>
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Kai Blin <kai@samba.org>
Autobuild-User(master): Kai Blin <kai@samba.org>
Autobuild-Date(master): Sat Sep 21 11:14:30 CEST 2013 on sn-devel-104

buildtools/wafadmin/Tools/ccroot.py

index f54c82f18671a3b7a2f647133a8bfe00a6014b1b..264bdc7f0f6350db145fcdcba22aff27a94b306a 100644 (file)
@@ -597,9 +597,12 @@ def apply_vnum(self):
        path = self.install_path
        if not path: return
 
-       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)
+       if self.env.DEST_OS == 'openbsd':
+               bld.install_as(path + os.sep + name2, node, env=self.env, chmod=self.link_task.chmod)
+       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)])