From 1655413f1246147db9b34d4684a64dac49cf5f0c Mon Sep 17 00:00:00 2001 From: Earl Chew Date: Fri, 27 Sep 2024 06:50:31 -0700 Subject: [PATCH] Describe implication of upstream ICU-22610 Add commentary to link commit 86c7688 (MR !3447) to the upstream fix for ICU-22610 in case there is subsequent breakage. Signed-off-by: Earl Chew Reviewed-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Nov 8 00:20:38 UTC 2024 on atb-devel-224 --- lib/util/charset/wscript_configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure index adae44eab5e..451f7f7bca3 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure @@ -37,6 +37,10 @@ conf.CHECK_CODE(''' lib='iconv', headers='errno.h iconv.h') +# Since commit 86c7688 (MR !3447), the required ICU libraries are discovered +# as a single group. This had the benefit of working around ICU-22610, and also +# works with the fix that was merged to ICU main in commit 199bc827. + if conf.CHECK_CFG(package='icu-i18n icu-uc', args='--cflags --libs', msg='Checking for icu-i18n icu-uc', -- 2.47.3