Attachment 10357 Details for Bug 10885 – Experimental patch for master

[patch] Experimental patch for master

tmp.diff.txt (text/plain), 1.22 KB, created by Stefan Metzmacher on 2014-10-20 09:17:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-10-20 09:17:11 UTC

Size: 1.22 KB

patch

obsolete

>From 47cf06e36ab88c656d9c7040500113e63e22f0ca Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 20 Oct 2014 10:45:53 +0200
>Subject: [PATCH] TEST... wafsamba: fix add -install_name in install_library()
> on OSX
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10885
>---
> buildtools/wafsamba/samba_install.py | 7 +++++++
> 1 file changed, 7 insertions(+)
>
>diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
>index aa7f143..67de690 100644
>--- a/buildtools/wafsamba/samba_install.py
>+++ b/buildtools/wafsamba/samba_install.py
>@@ -134,6 +134,13 @@ def install_library(self):
>             t.env.append_value('LINKFLAGS', t.env.SONAME_ST % install_name)
>         t.env.SONAME_ST = ''
> 
>+    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),
>-- 
>1.9.1
>

Flags:

slow: review-

Actions: View

Attachments on bug 10885: 10357