The branch, master has been updated via 68a1200f66e Restore empty string default for conf.env['icu-libs'] from 833c3f26b47 python/tests: Fix nlink test in smb3unix on btrfs filesystem
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 68a1200f66e9008ca0a739b37b48c49453ca9d83 Author: Earl Chew <earl_c...@yahoo.com> Date: Fri May 10 19:46:28 2024 -0700 Restore empty string default for conf.env['icu-libs'] The reworked ICU libraries configuration code used [] as default for conf.env['icu-libs']. This breaks dependency analysis in samba_deps.py because SAMBA_SUBSYSTEM() expects deps to be a string. Signed-off-by: Earl Chew <earl_c...@yahoo.com> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Tue May 14 14:44:06 UTC 2024 on atb-devel-224 ----------------------------------------------------------------------- Summary of changes: lib/util/charset/wscript_configure | 2 ++ 1 file changed, 2 insertions(+) Changeset truncated at 500 lines: diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index c49b55a4fd4..adae44eab5e 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -46,3 +46,5 @@ if conf.CHECK_CFG(package='icu-i18n icu-uc', if not conf.CHECK_HEADERS('unicode/ustring.h', lib='icui18n'): conf.fatal('Found icui18n, but unicode/ustring.h is missing') conf.DEFINE('HAVE_UTF8_NORMALISATION', 1) +else: + conf.env['icu-libs'] = '' -- Samba Shared Repository