Attachment 12171 Details for Bug 11946 – Patches for v4-4 branch

[patch] Patches for v4-4 branch

v4-4.patches (text/plain), 4.86 KB, created by Amitay Isaacs on 2016-06-09 04:14:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2016-06-09 04:14:59 UTC

Size: 4.86 KB

patch

obsolete

>From ffea7d977475f63ab7a36eb210285d634e6463a4 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Thu, 2 Jun 2016 17:17:19 +1000
>Subject: [PATCH 1/2] lib/util: Avoid splitting tevent-unix-util as public
> library
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11946
>
>Commit 670db6ac1d678babd25dd82c4467c0f094cfabc5 split tevent-util public
>library to create tevent-unix-util public library for standalone ctdb
>use.  This created a public library dependency between samba and ctdb
>for packaging.
>
>Bundle tevent_unix.c in public library tevent-util as before.  However,
>to avoid the dependencies for packaging, standalone ctdb build will
>build tevent-util as a private library with only tevent_unix.c
>
>This simplifies any new subsystems (or libraries) which need tevent-util
>and are linked in both samba and ctdb.
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 2082c0c3b5b62286d111d91c56541710ecc0ffa1)
>---
> ctdb/wscript           |  4 ++--
> lib/util/wscript_build | 23 +++++++++++------------
> 2 files changed, 13 insertions(+), 14 deletions(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index 5739269..3633148 100755
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -344,7 +344,7 @@ def build(bld):
>                                           '''db_hash.c srvid.c reqid.c
>                                              pkt_read.c pkt_write.c comm.c
>                                              logging.c'''),
>-                        deps='replace talloc tevent tdb tevent-unix-util')
>+                        deps='replace talloc tevent tdb tevent-util')
> 
>     bld.SAMBA_SUBSYSTEM('ctdb-protocol',
>                         source=bld.SUBDIR('protocol',
>@@ -636,7 +636,7 @@ def build(bld):
> 
>         bld.SAMBA_BINARY(target,
>                          source=src,
>-                         deps='talloc tevent tdb tevent-unix-util',
>+                         deps='talloc tevent tdb tevent-util',
>                          install_path='${CTDB_TEST_LIBDIR}')
> 
>     bld.SAMBA_BINARY('reqid_test',
>diff --git a/lib/util/wscript_build b/lib/util/wscript_build
>index 31e2958..2f53349 100755
>--- a/lib/util/wscript_build
>+++ b/lib/util/wscript_build
>@@ -69,16 +69,15 @@ bld.SAMBA_SUBSYSTEM('samba-util-core',
>                             tevent execinfo pthread''',
>                     local_include=False)
> 
>-bld.SAMBA_LIBRARY('tevent-unix-util',
>-                  source='tevent_unix.c',
>-                  local_include=False,
>-                  deps='tevent',
>-                  public_headers='tevent_unix.h',
>-                  header_path=[ ('*', 'util') ],
>-                  pc_files=[],
>-                  vnum='0.0.1')
>+if bld.env.SAMBA_UTIL_CORE_ONLY:
>+
>+    bld.SAMBA_LIBRARY('tevent-util',
>+                      source='tevent_unix.c',
>+                      local_include=False,
>+                      deps='tevent',
>+                      private_library=True)
> 
>-if not bld.env.SAMBA_UTIL_CORE_ONLY:
>+else:
> 
>     bld.env.public_headers_skip.append('charset_compat.h')
> 
>@@ -141,10 +140,10 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
>                       )
> 
>     bld.SAMBA_LIBRARY('tevent-util',
>-                      source='tevent_ntstatus.c tevent_werror.c',
>+                      source='tevent_unix.c tevent_ntstatus.c tevent_werror.c',
>                       local_include=False,
>-                      public_deps='tevent samba-errors tevent-unix-util',
>-                      public_headers='tevent_ntstatus.h tevent_werror.h',
>+                      public_deps='tevent samba-errors',
>+                      public_headers='tevent_ntstatus.h tevent_unix.h tevent_werror.h',
>                       header_path=[ ('*', 'util') ],
>                       pc_files=[],
>                       vnum='0.0.1'
>-- 
>2.5.5
>
>
>From 7c2547919cfc1e3c9068ed1a20163168ced61b26 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Thu, 2 Jun 2016 17:59:16 +1000
>Subject: [PATCH 2/2] ctdb-packaging: Remove tevent-unix-util public library
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11946
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 97e1f53daeb1edf7f0a337c38dd9f8d7d8e36321)
>---
> ctdb/packaging/RPM/ctdb.spec.in | 3 ---
> 1 file changed, 3 deletions(-)
>
>diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
>index 1547dfb..9d354ae 100644
>--- a/ctdb/packaging/RPM/ctdb.spec.in
>+++ b/ctdb/packaging/RPM/ctdb.spec.in
>@@ -207,7 +207,6 @@ rm -rf $RPM_BUILD_ROOT
> %{_libexecdir}/ctdb/smnotify
> %dir %{_libdir}
> %{_libdir}/ctdb/lib*
>-%{_libdir}/libtevent-unix-util.so.0*
> %{_mandir}/man1/ctdb.1.gz
> %{_mandir}/man1/ctdbd.1.gz
> %{_mandir}/man1/ctdbd_wrapper.1.gz
>@@ -229,8 +228,6 @@ development libraries for ctdb
> 
> %files devel
> %defattr(-,root,root)
>-%{_includedir}/ctdb/util/*.h
>-%{_libdir}/libtevent-unix-util.so
> 
> %package tests
> Summary: CTDB test suite
>-- 
>2.5.5
>

Flags:

martins: review+

Actions: View

Attachments on bug 11946: 12171