Attachment 10563 Details for Bug 10112 – Patch for v4-2-test (part1)

[patch] Patch for v4-2-test (part1)

tmp42-01.diff.txt (text/plain), 2.97 KB, created by Stefan Metzmacher on 2014-12-23 22:28:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-12-23 22:28:04 UTC

Size: 2.97 KB

patch

obsolete

>From 7a54416bbb67348602aeecebeede9e4f99cd26cf Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 18 Dec 2014 15:05:12 +0100
>Subject: [PATCH] wafsamba: fill PRIVATE_NAME() logic again
>
>We append bld.env.PRIVATE_EXTENSION to the name of private libraries
>again, but only unless they have a abi_directory, vnum or soname defined.
>
>This avoids naming conflicts with system libraries, e.g. libidmap.so
>on Solaris
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=10112
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 76fdcf5c15bd904c3686f0c2dd93d27486c61ca4)
>---
> buildtools/wafsamba/samba_bundled.py | 16 +++++++++++++++-
> buildtools/wafsamba/wafsamba.py      |  9 ++++++---
> 2 files changed, 21 insertions(+), 4 deletions(-)
>
>diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
>index 45946d5..515590f 100644
>--- a/buildtools/wafsamba/samba_bundled.py
>+++ b/buildtools/wafsamba/samba_bundled.py
>@@ -7,11 +7,25 @@ from samba_utils import *
> def PRIVATE_NAME(bld, name, private_extension, private_library):
>     '''possibly rename a library to include a bundled extension'''
> 
>+    if not private_library:
>+        return name
>+
>     # we now use the same private name for libraries as the public name.
>     # see http://git.samba.org/?p=tridge/junkcode.git;a=tree;f=shlib for a
>     # demonstration that this is the right thing to do
>     # also see http://lists.samba.org/archive/samba-technical/2011-January/075816.html
>-    return name
>+    if private_extension:
>+        return name
>+
>+    extension = bld.env.PRIVATE_EXTENSION
>+
>+    if extension and name.startswith('%s' % extension):
>+        return name
>+
>+    if extension and name.endswith('%s' % extension):
>+        return name
>+
>+    return "%s-%s" % (name, extension)
> 
> 
> def target_in_list(target, lst, default):
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index e564877..07c76d3 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -124,7 +124,7 @@ def SAMBA_LIBRARY(bld, libname, source,
>                   pyembed=False,
>                   pyext=False,
>                   target_type='LIBRARY',
>-                  bundled_extension=True,
>+                  bundled_extension=False,
>                   link_name=None,
>                   abi_directory=None,
>                   abi_match=None,
>@@ -218,8 +218,11 @@ def SAMBA_LIBRARY(bld, libname, source,
>         else:
>             bundled_name = libname.replace('_', '-')
>     else:
>-        bundled_name = PRIVATE_NAME(bld, libname, bundled_extension,
>-            private_library)
>+        assert (private_library == True and realname is None)
>+        if abi_directory or vnum or soname:
>+            bundled_extension=True
>+        bundled_name = PRIVATE_NAME(bld, libname.replace('_', '-'),
>+                                    bundled_extension, private_library)
> 
>     ldflags = TO_LIST(ldflags)
> 
>-- 
>1.9.1
>

Actions: View

Attachments on bug 10112: 9160 | 9215 | 10550 | 10563 | 10564