zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xerces-c: Add cxxstd variant (#10561)

Browse Source 
Add variant to support compiling against main C++ standards if needed
for ABI compatibility. Use 'default' value as Xerces-C autoconf system
does not enforce a minimum, or set a default, C++ standard.
This commit is contained in:
Ben Morgan 2019-02-12 08:40:59 +00:00 committed by Massimiliano Culpo
parent dc12ca5c76
commit 8fd4e9a9fa
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/xerces-c/package.py
View File

@ -21,6 +21,15 @@ class XercesC(AutotoolsPackage):
version('3.2.1', '8f98a81a3589bbc2dad9837452f7d319') version('3.2.1', '8f98a81a3589bbc2dad9837452f7d319')
version('3.1.4', 'd04ae9d8b2dee2157c6db95fa908abfd') version('3.1.4', 'd04ae9d8b2dee2157c6db95fa908abfd')
# Whilst still using Autotools, can use full cxxstd with 'default'
# If build is moved to CMake, then will also need a patch to Xerces-C's
# CMakeLists.txt as a specific standard cannot be forced
variant('cxxstd',
default='default',
values=('default', '98', '11', '14', '17'),
multi=False,
description='Use the specified C++ standard when building')
# It's best to be explicit about the transcoder or else xerces may # It's best to be explicit about the transcoder or else xerces may
# choose another value. # choose another value.
if sys.platform == 'darwin': if sys.platform == 'darwin':
@ -43,6 +52,12 @@ class XercesC(AutotoolsPackage):
def flag_handler(self, name, flags): def flag_handler(self, name, flags):
spec = self.spec spec = self.spec
# Need to pass -std flag explicitly
if name == 'cxxflags' and spec.variants['cxxstd'].value != 'default':
flags.append(getattr(self.compiler,
'cxx{0}_flag'.format(
spec.variants['cxxstd'].value)))
# There is no --with-pkg for gnuiconv. # There is no --with-pkg for gnuiconv.
if name == 'ldflags' and 'transcoder=gnuiconv' in spec: if name == 'ldflags' and 'transcoder=gnuiconv' in spec:
flags.append(spec['libiconv'].libs.ld_flags) flags.append(spec['libiconv'].libs.ld_flags)