build: check minimum ICU in configure for system-icu

- check the version number coming out of pkg-config PR-URL: #24255Fixes: #24253 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]>

Author: srl295

configure.py

@@ -434,7 +434,7 @@
 dest='with_icu_source',
 help='Intl mode: optional local path to icu/ dir, or path/URL of '
 'the icu4c source archive. '
-'v%d.x or later recommended.'%icu_versions["minimum_icu"])
+'v%d.x or later recommended.'%icu_versions['minimum_icu'])
 
 parser.add_option('--with-ltcg',
 action='store_true',
@@ -622,17 +622,21 @@ def b(value):
 
 
 defpkg_config(pkg):
+"""Run pkg-config on the specified package
+ Returns ("-l flags", "-I flags", "-L flags", "version")
+ otherwise (None, None, None, None)"""
 pkg_config=os.environ.get('PKG_CONFIG', 'pkg-config')
 retval= ()
-forflagin ['--libs-only-l', '--cflags-only-I', '--libs-only-L']:
+forflagin ['--libs-only-l', '--cflags-only-I',
+'--libs-only-L', '--modversion']:
 try:
 proc=subprocess.Popen(
 shlex.split(pkg_config) + ['--silence-errors', flag, pkg],
 stdout=subprocess.PIPE)
 val=proc.communicate()[0].strip()
 exceptOSErrorase:
 ife.errno!=errno.ENOENT: raisee# Unexpected error.
-return (None, None, None) # No pkg-config/pkgconf installed.
+return (None, None, None, None) # No pkg-config/pkgconf installed.
 retval+= (val,)
 returnretval
 
@@ -1119,7 +1123,7 @@ def configure_library(lib, output):
 output['variables']['node_'+shared_lib] =b(getattr(options, shared_lib))
 
 ifgetattr(options, shared_lib):
- (pkg_libs, pkg_cflags, pkg_libpath) =pkg_config(lib)
+ (pkg_libs, pkg_cflags, pkg_libpath, pkg_modversion) =pkg_config(lib)
 
 ifoptions.__dict__[shared_lib+'_includes']:
 output['include_dirs'] += [options.__dict__[shared_lib+'_includes']]
@@ -1354,7 +1358,12 @@ def write_config(data, name):
 ifpkgicu[0] isNone:
 error('''Could not load pkg-config data for "icu-i18n".
  See above errors or the README.md.''')
- (libs, cflags, libpath) =pkgicu
+ (libs, cflags, libpath, icuversion) =pkgicu
+icu_ver_major=icuversion.split('.')[0]
+o['variables']['icu_ver_major'] =icu_ver_major
+ifint(icu_ver_major) <icu_versions['minimum_icu']:
+error('icu4c v%s is too old, v%d.x or later is required.'%
+ (icuversion, icu_versions['minimum_icu']))
 # libpath provides linker path which may contain spaces
 iflibpath:
 o['libraries'] += [libpath]
@@ -1473,9 +1482,9 @@ def write_config(data, name):
 icu_ver_major=m.group(1)
 ifnoticu_ver_major:
 error('Could not read U_ICU_VERSION_SHORT version from %s'%uvernum_h)
-elifint(icu_ver_major) <icu_versions["minimum_icu"]:
-error('icu4c v%d.x is too old, v%d.x or later is required.'% (int(icu_ver_major),
-icu_versions["minimum_icu"]))
+elifint(icu_ver_major) <icu_versions['minimum_icu']:
+error('icu4c v%s.x is too old, v%d.x or later is required.'%
+(icu_ver_major, icu_versions['minimum_icu']))
 icu_endianness=sys.byteorder[0];
 o['variables']['icu_ver_major'] =icu_ver_major
 o['variables']['icu_endianness'] =icu_endianness