Xerces-C: Add option to disable transcoder (#31162)

* Xerces-C: Add option to disable transcoder

* Update package.py

* Apply suggestion from review

* Flake-8

1 files changed, 10 insertions, 15 deletions

diff --git a/var/spack/repos/builtin/packages/xerces-c/package.py b/var/spack/repos/builtin/packages/xerces-c/package.py
index 94094ceab4..4088807bb9 100644
--- a/var/spack/repos/builtin/packages/xerces-c/package.py
+++ b/var/spack/repos/builtin/packages/xerces-c/package.py
@@ -51,7 +51,7 @@ class XercesC(AutotoolsPackage):
         default_transcoder = 'gnuiconv'
 
     variant('transcoder', default=default_transcoder,
-            values=('gnuiconv', 'iconv', 'icu', 'macos', 'windows'),
+            values=('gnuiconv', 'iconv', 'icu', 'macos', 'windows', 'none'),
             multi=False,
             description='Use the specified transcoder')
 
@@ -85,20 +85,15 @@ class XercesC(AutotoolsPackage):
         else:
             args.append('--disable-network')
 
-        if 'transcoder=gnuiconv' in spec:
-            args.append('--enable-transcoder-gnuiconv')
-
-        if 'transcoder=iconv' in spec:
-            args.append('--enable-transcoder-iconv')
-
-        if 'transcoder=icu' in spec:
-            args.append('--enable-transcoder-icu')
-            args.append('--with-icu=%s' % spec['icu4c'].prefix)
-
-        if 'transcoder=macos' in spec:
+        transcoder = spec.variants['transcoder'].value
+        if transcoder == 'none':
+            args.append('--without-icu')
+        elif transcoder == 'icu':
+            args.extend(['--enable-transcoder-icu',
+                         '--with-icu=' + spec['icu4c'].prefix])
+        elif transcoder == 'macos':
             args.append('--enable-transcoder-macosunicodeconverter')
-
-        if 'transcoder=windows' in spec:
-            args.append('--enable-transcoder-windows')
+        else:
+            args.append('--enable-transcoder-' + transcoder)
 
         return args