TEST... wafsamba: fix add -install_name in install_library() on OSX

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10885

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 2957e16c3da8cea75c8e30a8347fe93a11f1bdec..d8c84767d85be7aff037f4e170a99a4a386aa362 100644 (file)
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -130,6 +130,7 @@ def install_library(self):
             install_link = None
             inst_name    = bld.make_libname(t.target)
 
+<<<<<<< HEAD
         if t.env.SONAME_ST:
             # ensure we get the right names in the library
             if install_link:
@@ -150,6 +151,24 @@ def install_library(self):
             bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
     finally:
         bld.all_envs['default'] = default_env
+=======
+    if '-dynamiclib' in self.env['LINKFLAGS']:
+        t.env.append_value('LINKFLAGS', '-install_name')
+        if install_link:
+            t.env.append_value('LINKFLAGS', os.path.join(install_path, install_link))
+        else:
+            t.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
+
+    # tell waf to install the library
+    bld.install_as(os.path.join(install_path, install_name),
+                   os.path.join(self.path.abspath(bld.env), inst_name),
+                   chmod=MODE_755)
+    if install_link and install_link != install_name:
+        # and the symlink if needed
+        bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
+    if dev_link:
+        bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
+>>>>>>> c7bf0d7... TEST... wafsamba: fix add -install_name in install_library() on OSX
 
 
 @feature('cshlib')