Attachment 17254 Details for Bug 8731 – patch for samba 4.16

[patch] patch for samba 4.16

0001-waf-Document-the-confusing-nonshared-binary-builtin-.patch (text/plain), 5.65 KB, created by Andrew Bartlett on 2022-03-29 04:05:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2022-03-29 04:05:46 UTC

Size: 5.65 KB

patch

obsolete

>From 586432d9a4becc67f66c8a03f4ccf7c593111c31 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Mon, 28 Mar 2022 11:16:51 +1300
>Subject: [PATCH] waf: Document the confusing --nonshared-binary,
> --builtin-libraries, --private-libraries and --bundled-libraries
>
>These options are confusing to all who encounter them.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=8731
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Mon Mar 28 10:06:01 UTC 2022 on sn-devel-184
>
>(cherry picked from commit 14e7112734bbb31db99e394323ef2cb31385ebf7)
>---
> buildtools/wafsamba/wscript | 67 +++++++++++++++++++++++++++++++++----
> 1 file changed, 60 insertions(+), 7 deletions(-)
>
>diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
>index 62b63fef145..a4d6f3e5c49 100644
>--- a/buildtools/wafsamba/wscript
>+++ b/buildtools/wafsamba/wscript
>@@ -30,11 +30,37 @@ def options(opt):
>     gr = opt.option_group('library handling options')
> 
>     gr.add_option('--bundled-libraries',
>-                   help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"),
>+                   help=(f'''comma separated list of bundled libraries.
>+
>+{Context.g_module.APPNAME} includes copies of externally maintained
>+system libraries (such as popt, cmokca) as well as Samba-maintained
>+libraries that can be found on the system already (such as talloc,
>+tdb).
>+
>+This option, most useful for packagers, controls if each library
>+should be forced to be obtained from inside Samba (bundled), forced to
>+be obtained from the system (bundling disabled, ensuing that
>+dependency errors are not silently missed) or if that choice should be
>+automatic (best for end users).
>+
>+May include !LIBNAME to disable bundling a library.
>+
>+Can be 'NONE' or 'ALL' [auto]'''),
>                    action="store", dest='BUNDLED_LIBS', default='')
> 
>     gr.add_option('--private-libraries',
>-                   help=("comma separated list of normally public libraries to build instead as private libraries. May include !LIBNAME to disable making a library private in order to limit the effect of 'ALL'"),
>+                   help=(f'''comma separated list of normally public libraries to build instead as private libraries.
>+
>+By default {Context.g_module.APPNAME} will publish a number of public
>+libraries for use by other software.  For Samba this would include
>+libwbclient, libsmbclient and others.
>+
>+This allows that to be disabled, to ensure that other software does
>+not use these libraries and they are placed in a private filesystem
>+prefix.
>+
>+May include !LIBNAME to disable making a library private in order to
>+limit the effect of 'ALL' '''),
>                    action="store", dest='PRIVATE_LIBS', default='')
> 
>     extension_default = default_value('PRIVATE_EXTENSION_DEFAULT')
>@@ -48,12 +74,33 @@ def options(opt):
>                    action="store", dest='PRIVATE_EXTENSION_EXCEPTION', default=extension_exception)
> 
>     builtin_default = default_value('BUILTIN_LIBRARIES_DEFAULT')
>-    gr.add_option('--builtin-libraries',
>-                   help=("command separated list of libraries to build directly into binaries [%s]" % builtin_default),
>-                   action="store", dest='BUILTIN_LIBRARIES', default=builtin_default)
>+    gr.add_option('--builtin-libraries', help=(
>+f'''comma separated list of libraries to build directly into binaries.
>+
>+By default {Context.g_module.APPNAME} will build a large number of
>+shared libraries, to reduce binary size.  This overrides this
>+behaviour and essentially statically links the specified libraries into
>+each binary [{builtin_default}]'''),
>+                  action="store",
>+                  dest='BUILTIN_LIBRARIES', default=builtin_default)
> 
>     gr.add_option('--minimum-library-version',
>-                   help=("list of minimum system library versions (LIBNAME1:version,LIBNAME2:version)"),
>+                   help=(
>+f'''list of minimum system library versions for otherwise bundled
>+libraries.
>+
>+{Context.g_module.APPNAME} by default requires that, in order to match
>+what is tested in our continuous integration (CI) test-suite, that the
>+versions of libraries that we include match that found on the system,
>+before we will select not to 'bundle'.
>+
>+This option, possibly useful for packagers, allows that specified
>+version to be overridden (say, if it is absolutely known that a the
>+newer version included in this tarball has no relevant changes).
>+
>+Use this with extreme care
>+
>+(LIBNAME1:version,LIBNAME2:version)'''),
>                    action="store", dest='MINIMUM_LIBRARY_VERSION', default='')
> 
>     gr.add_option('--disable-rpath',
>@@ -66,7 +113,13 @@ def options(opt):
>                    help=("Disable use of rpath for private library path in installed files"),
>                    action="store_true", dest='disable_rpath_private_install', default=False)
>     gr.add_option('--nonshared-binary',
>-                   help=("Disable use of shared libs for the listed binaries"),
>+                   help=(
>+f'''Disable use of shared libaries internal to {Context.g_module.APPNAME} for the listed binaries.
>+
>+The resulting binaries are 'statically linked' with regard to components provided by
>+{Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so
>+
>+Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''),
>                    action="store", dest='NONSHARED_BINARIES', default='')
>     gr.add_option('--disable-symbol-versions',
>                    help=("Disable use of the --version-script linker option"),
>-- 
>2.25.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 8731: 7342 | 17254