[arch-commits] Commit in samba/trunk (PKGBUILD libsystemd.patch)

Jan Steffens heftig at archlinux.org
Tue Mar 22 14:25:54 UTC 2016


    Date: Tuesday, March 22, 2016 @ 15:25:54
  Author: heftig
Revision: 262261

Adjust patch

Modified:
  samba/trunk/PKGBUILD
  samba/trunk/libsystemd.patch

------------------+
 PKGBUILD         |    2 +-
 libsystemd.patch |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-22 14:25:46 UTC (rev 262260)
+++ PKGBUILD	2016-03-22 14:25:54 UTC (rev 262261)
@@ -251,7 +251,7 @@
 }
 md5sums=('e42b884d0e07528c8571641a4df40666'
          'SKIP'
-         '13085841ad03ab3a5c99bd22917a8ccc'
+         'ab4d156dd6be268aaf462fbd7f40a55b'
          '5697da77590ec092cc8a883bae06093c'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'

Modified: libsystemd.patch
===================================================================
--- libsystemd.patch	2016-03-22 14:25:46 UTC (rev 262260)
+++ libsystemd.patch	2016-03-22 14:25:54 UTC (rev 262261)
@@ -1,21 +1,21 @@
-diff -u -r samba-4.3.4/lib/util/wscript_configure samba-4.3.4-libsystemd/lib/util/wscript_configure
---- samba-4.3.4/lib/util/wscript_configure	2015-09-08 15:45:25.000000000 +0200
-+++ samba-4.3.4-libsystemd/lib/util/wscript_configure	2016-02-12 20:07:28.821295667 +0100
+diff -u -r samba-4.4.0/lib/util/wscript_configure samba-4.4.0-libsystemd/lib/util/wscript_configure
+--- samba-4.4.0/lib/util/wscript_configure	2016-01-26 12:45:46.000000000 +0100
++++ samba-4.4.0-libsystemd/lib/util/wscript_configure	2016-03-22 15:24:35.308586071 +0100
 @@ -110,16 +110,23 @@
  conf.SET_TARGET_TYPE('systemd', 'EMPTY')
  
  if Options.options.enable_systemd != False:
--    conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
+-    conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs',
 -                   msg='Checking for libsystemd-daemon')
 -    if not conf.CHECK_LIB('systemd-daemon', shlib=True):
 -        conf.CHECK_LIB('systemd', shlib=True)
-+    conf.check_cfg(package='libsystemd', args='--cflags --libs',
++    conf.CHECK_CFG(package='libsystemd', args='--cflags --libs',
 +                   msg='Checking for libsystemd', uselib_store='SYSTEMD')
 +    conf.CHECK_HEADERS('systemd/sd-daemon.h systemd/sd-journal.h', lib='systemd')
 +    conf.CHECK_LIB('systemd', shlib=True)
  
 -if Options.options.enable_systemd != False:
--    conf.check_cfg(package='libsystemd-journal', args='--cflags --libs',
+-    conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
 -                   msg='Checking for libsystemd-journal')
 -    if not conf.CHECK_LIB('systemd-journal', shlib=True):
 -        conf.CHECK_LIB('systemd', shlib=True)
@@ -23,14 +23,14 @@
 +        conf.DEFINE('HAVE_LIBSYSTEMD_DAEMON', '1')
 +        conf.DEFINE('HAVE_LIBSYSTEMD_JOURNAL', '1')
 +    else:
-+        conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
++        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-daemon', shlib=True)
-+        conf.check_cfg(package='libsystemd-journal', args='--cflags --libs',
++        conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
 +                       msg='Checking for libsystemd-journal', uselib_store='SYSTEMD_JOURNAL')
 +        conf.CHECK_HEADERS('systemd/sd-journal.h', lib='systemd-journal')
 +        conf.CHECK_LIB('systemd-journal', shlib=True)
  
  if Options.options.enable_lttng != False:
-     conf.check_cfg(package='lttng-ust', args='--cflags --libs',
+     conf.CHECK_CFG(package='lttng-ust', args='--cflags --libs',



More information about the arch-commits mailing list