hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

autotools: Fix config.guess detection (#17149)

Browse source 
The config.guess detection used a relative path that did not work in
combination with `check_call`. Use an absolute path instead.
This commit is contained in:
Michael Kuhn 2020-06-29 17:08:22 +02:00 committed by GitHub
parent 789d060ff6
commit b07d38b3be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/spack/spack/build_systems/autotools.py
View file

@ -118,13 +118,15 @@ def _do_patch_config_files(self):
config_file = 'config.{0}'.format(config_name) config_file = 'config.{0}'.format(config_name)
if os.path.exists(config_file): if os.path.exists(config_file):
# First search the top-level source directory # First search the top-level source directory
my_config_files[config_name] = config_file my_config_files[config_name] = os.path.join(
self.configure_directory, config_file)
else: else:
# Then search in all sub directories recursively. # Then search in all sub directories recursively.
# We would like to use AC_CONFIG_AUX_DIR, but not all packages # We would like to use AC_CONFIG_AUX_DIR, but not all packages
# ship with their configure.in or configure.ac. # ship with their configure.in or configure.ac.
config_path = next((os.path.join(r, f) config_path = next((os.path.join(r, f)
for r, ds, fs in os.walk('.') for f in fs for r, ds, fs in os.walk(
self.configure_directory) for f in fs
if f == config_file), None) if f == config_file), None)
my_config_files[config_name] = config_path my_config_files[config_name] = config_path