diff --git a/science/cantera/files/patch-SConstruct b/science/cantera/files/patch-SConstruct index de5294d25f39..cbccdcef24f3 100644 --- a/science/cantera/files/patch-SConstruct +++ b/science/cantera/files/patch-SConstruct @@ -1,44 +1,55 @@ +- the first part is fixing the configure failure, see https://github.com/Cantera/cantera/issues/1536 + --- SConstruct.orig 2022-05-01 15:31:54 UTC +++ SConstruct +@@ -191,7 +191,7 @@ config_options = [ + { + "cl": "/EHsc", + "Cygwin": "-std=gnu++11", # See http://stackoverflow.com/questions/18784112 +- "default": "-std=c++11" ++ "default": "-std=c++14" + }), + Option( + "CC", @@ -805,6 +805,9 @@ elif "icx" in env.subst("$CC"): elif "clang" in env.subst("$CC"): config.select("clang") +elif "cc" in env.subst("$CC"): + config.select("clang") + else: print(f"WARNING: Unrecognized C compiler '{env['CC']}'") @@ -869,10 +872,10 @@ if "sdist" in COMMAND_LINE_TARGETS: logger.info("'sdist' target was specified. Setting 'use_pch' to False.") env["use_pch"] = False -for arg in ARGUMENTS: - if arg not in config: - logger.error(f"Encountered unexpected command line option: '{arg}'") - sys.exit(1) +#for arg in ARGUMENTS: +# if arg not in config: +# logger.error(f"Encountered unexpected command line option: '{arg}'") +# sys.exit(1) env["cantera_version"] = "2.6.0" # For use where pre-release tags are not permitted (MSI, sonames) @@ -1673,11 +1676,11 @@ if env["matlab_toolbox"] == "y": "SUNDIALS libraries and skip building the Matlab toolbox.") sys.exit(1) - if not (os.path.isdir(matlab_path) and - os.path.isdir(pjoin(matlab_path, "extern"))): - logger.error( - f"Path set for 'matlab_path' is not correct. Path was '{matlab_path}'") - sys.exit(1) + #if not (os.path.isdir(matlab_path) and + # os.path.isdir(pjoin(matlab_path, "extern"))): + # logger.error( + # f"Path set for 'matlab_path' is not correct. Path was '{matlab_path}'") + # sys.exit(1) # **********************************************