Attachment 10571 Details for Bug 10672 – Patch for git HEAD, supporting both new and old names

[patch] Patch for git HEAD, supporting both new and old names

0001-build-support-libsystemd-merged-from-libsystemd-daem.patch (text/plain), 2.82 KB, created by Michał Górny on 2015-01-03 18:42:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michał Górny

Created: 2015-01-03 18:42:55 UTC

Size: 2.82 KB

patch

obsolete

>From 11c75bd0a2bea740ed181b7f1d4420a7f84a6926 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
>Date: Sat, 3 Jan 2015 18:59:48 +0100
>Subject: [PATCH] build: support libsystemd, merged from libsystemd-daemon
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Starting with v209, public APIs of systemd are contained in a single
>library called libsystemd. Support it alongside old libsystemd-daemon.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10672
>
>Signed-off-by: MichaÅ GÃ³rny <mgorny@gentoo.org>
>---
> lib/util/wscript_build | 2 +-
> wscript                | 7 ++++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/lib/util/wscript_build b/lib/util/wscript_build
>index c0d07e7..233a1be 100755
>--- a/lib/util/wscript_build
>+++ b/lib/util/wscript_build
>@@ -59,7 +59,7 @@ if not bld.env.SAMBA_UTIL_CORE_ONLY:
>                     tevent_debug.c util_process.c memcache.c''',
>                   deps='samba-util-core DYNCONFIG close-low-fd tini tiniparser',
> 
>-                  public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd-daemon',
>+                  public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
>                   public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h',
>                   header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
>                   local_include=False,
>diff --git a/wscript b/wscript
>index d5a4ccb..7014eea 100644
>--- a/wscript
>+++ b/wscript
>@@ -216,17 +216,22 @@ def configure(conf):
>             conf.env['ENABLE_RELRO'] = True
> 
>     if Options.options.enable_systemd != False:
>+        conf.check_cfg(package='libsystemd', args='--cflags --libs',
>+                       msg='Checking for libsystemd', uselib_store="SYSTEMD")
>         conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
>                        msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON")
>         conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
>+        conf.CHECK_LIB('systemd', shlib=True)
>         conf.CHECK_LIB('systemd-daemon', shlib=True)
> 
>     if (conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and
>-        conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON')):
>+        (conf.CONFIG_SET('HAVE_LIBSYSTEMD')
>+            or conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON'))):
>         conf.DEFINE('HAVE_SYSTEMD', '1')
>         conf.env['ENABLE_SYSTEMD'] = True
>     else:
>         conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY')
>+        conf.SET_TARGET_TYPE('systemd', 'EMPTY')
>         conf.undefine('HAVE_SYSTEMD')
> 
>     conf.SAMBA_CONFIG_H('include/config.h')
>-- 
>2.2.1
>

Actions: View

Attachments on bug 10672: 10053 | 10058 | 10059 | 10074 | 10075 | 10571 | 10572