[arch-commits] Commit in talloc/trunk (3 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat Oct 26 03:41:41 UTC 2019
Date: Saturday, October 26, 2019 @ 03:41:40
Author: foutrelis
Revision: 365741
Add missing patch and remove old patch
Added:
talloc/trunk/wafsamba-use-native-waf-timer.patch
Modified:
talloc/trunk/PKGBUILD
Deleted:
talloc/trunk/fix_test_path.patch
-------------------------------------+
PKGBUILD | 6 -
fix_test_path.patch | 13 ---
wafsamba-use-native-waf-timer.patch | 114 ++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-26 03:39:41 UTC (rev 365740)
+++ PKGBUILD 2019-10-26 03:41:40 UTC (rev 365741)
@@ -13,13 +13,11 @@
optdepends=('python: for python bindings')
source=(https://www.samba.org/ftp/talloc/talloc-$pkgver.tar.{gz,asc}
samba-update-waf-for-py38.patch::https://gitlab.com/samba-team/samba/commit/aabdcc9151.patch
- wafsamba-use-native-waf-timer.patch
- fix_test_path.patch)
+ wafsamba-use-native-waf-timer.patch)
sha1sums=('d806e2e4e9b973e8ab6521d1dd20a03abae32c99'
'SKIP'
'ab8f8bd63c722e2e3b709e89fa3c1e222daac988'
- '2e688ce37d2f5027ba6e4eb52503353d9707fdae'
- '6117e3dffb24bf03d54325c13b7db3b8a7eb2850')
+ '2e688ce37d2f5027ba6e4eb52503353d9707fdae')
validpgpkeys=(9147A339719518EE9011BCB54793916113084025) # samba-bugs at samba.org
prepare() {
Deleted: fix_test_path.patch
===================================================================
--- fix_test_path.patch 2019-10-26 03:39:41 UTC (rev 365740)
+++ fix_test_path.patch 2019-10-26 03:41:40 UTC (rev 365741)
@@ -1,13 +0,0 @@
-diff --git a/wscript b/wscript
-index 9cedbbf..4432a9a 100644
---- a/wscript
-+++ b/wscript
-@@ -159,7 +159,7 @@ def test(ctx):
- ret = samba_utils.RUN_COMMAND(cmd)
- print("testsuite returned %d" % ret)
- magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper')
-- magic_cmd = os.path.join(srcdir, 'lib', 'talloc',
-+ magic_cmd = os.path.join(srcdir,
- 'test_magic_differs.sh')
-
- magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd)
Added: wafsamba-use-native-waf-timer.patch
===================================================================
--- wafsamba-use-native-waf-timer.patch (rev 0)
+++ wafsamba-use-native-waf-timer.patch 2019-10-26 03:41:40 UTC (rev 365741)
@@ -0,0 +1,114 @@
+From dc27ff44de578b0b429a24b0e42e243d8bf481a8 Mon Sep 17 00:00:00 2001
+From: Lukas Slebodnik <lslebodn at fedoraproject.org>
+Date: Wed, 12 Jun 2019 12:27:04 +0200
+Subject: [PATCH] wafsamba: Use native waf timer
+
+ __main__:1: DeprecationWarning: time.clock has been deprecated in Python 3.3
+ and will be removed from Python 3.8: use time.perf_counter
+ or time.process_time instead
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13998
+
+Signed-off-by: Lukas Slebodnik <lslebodn at fedoraproject.org>
+Reviewed-by: Andreas Schneider <asn at samba.org>
+Reviewed-by: Alexander Bokovoy <ab at samba.org>
+---
+ buildtools/wafsamba/samba_deps.py | 25 ++++++++++++-------------
+ 1 file changed, 12 insertions(+), 13 deletions(-)
+
+diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
+index f8c38809bd2..03c37079a8c 100644
+--- a/buildtools/wafsamba/samba_deps.py
++++ b/buildtools/wafsamba/samba_deps.py
+@@ -1,6 +1,6 @@
+ # Samba automatic dependency handling and project rules
+
+-import os, sys, re, time
++import os, sys, re
+
+ from waflib import Build, Options, Logs, Utils, Errors
+ from waflib.Logs import debug
+@@ -1102,8 +1102,7 @@ def check_project_rules(bld):
+ if not force_project_rules and load_samba_deps(bld, tgt_list):
+ return
+
+- global tstart
+- tstart = time.clock()
++ timer = Utils.Timer()
+
+ bld.new_rules = True
+ Logs.info("Checking project rules ...")
+@@ -1112,26 +1111,26 @@ def check_project_rules(bld):
+
+ expand_subsystem_deps(bld)
+
+- debug("deps: expand_subsystem_deps: %f" % (time.clock() - tstart))
++ debug("deps: expand_subsystem_deps: %s" % str(timer))
+
+ replace_grouping_libraries(bld, tgt_list)
+
+- debug("deps: replace_grouping_libraries: %f" % (time.clock() - tstart))
++ debug("deps: replace_grouping_libraries: %s" % str(timer))
+
+ build_direct_deps(bld, tgt_list)
+
+- debug("deps: build_direct_deps: %f" % (time.clock() - tstart))
++ debug("deps: build_direct_deps: %s" % str(timer))
+
+ break_dependency_loops(bld, tgt_list)
+
+- debug("deps: break_dependency_loops: %f" % (time.clock() - tstart))
++ debug("deps: break_dependency_loops: %s" % str(timer))
+
+ if Options.options.SHOWDEPS:
+ show_dependencies(bld, Options.options.SHOWDEPS, set())
+
+ calculate_final_deps(bld, tgt_list, loops)
+
+- debug("deps: calculate_final_deps: %f" % (time.clock() - tstart))
++ debug("deps: calculate_final_deps: %s" % str(timer))
+
+ if Options.options.SHOW_DUPLICATES:
+ show_object_duplicates(bld, tgt_list)
+@@ -1140,7 +1139,7 @@ def check_project_rules(bld):
+ for f in [ build_dependencies, build_includes, add_init_functions ]:
+ debug('deps: project rules checking %s', f)
+ for t in tgt_list: f(t)
+- debug("deps: %s: %f" % (f, time.clock() - tstart))
++ debug("deps: %s: %s" % (f, str(timer)))
+
+ debug('deps: project rules stage1 completed')
+
+@@ -1148,17 +1147,17 @@ def check_project_rules(bld):
+ Logs.error("Duplicate sources present - aborting")
+ sys.exit(1)
+
+- debug("deps: check_duplicate_sources: %f" % (time.clock() - tstart))
++ debug("deps: check_duplicate_sources: %s" % str(timer))
+
+ if not bld.check_group_ordering(tgt_list):
+ Logs.error("Bad group ordering - aborting")
+ sys.exit(1)
+
+- debug("deps: check_group_ordering: %f" % (time.clock() - tstart))
++ debug("deps: check_group_ordering: %s" % str(timer))
+
+ show_final_deps(bld, tgt_list)
+
+- debug("deps: show_final_deps: %f" % (time.clock() - tstart))
++ debug("deps: show_final_deps: %s" % str(timer))
+
+ debug('deps: project rules checking completed - %u targets checked',
+ len(tgt_list))
+@@ -1166,7 +1165,7 @@ def check_project_rules(bld):
+ if not bld.is_install:
+ save_samba_deps(bld, tgt_list)
+
+- debug("deps: save_samba_deps: %f" % (time.clock() - tstart))
++ debug("deps: save_samba_deps: %s" % str(timer))
+
+ Logs.info("Project rules pass")
+
+--
+2.22.0
+
More information about the arch-commits
mailing list