Skip to content

Commit 7b4fcb6

Browse files
authored
Merge pull request #2736 from boegel/20220604202000_new_pr_openssl_wrapper
ignore exit code of pkg-config command in OpenSSL wrapper easyblock, since with pkgconf they exit with a non-zero exit code if the OS package is not installed
2 parents 3cb9146 + 941b839 commit 7b4fcb6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

easybuild/easyblocks/o/openssl_wrapper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ def install_pc_files(self):
427427
pc_file['requires'] = []
428428
for require_type in ['Requires', 'Requires.private']:
429429
require_print = require_type.lower().replace('.', '-')
430-
requires, _ = run_cmd("pkg-config --print-%s %s" % (require_print, pc_name), simple=False)
430+
requires, _ = run_cmd("pkg-config --print-%s %s" % (require_print, pc_name), simple=False, log_ok=False)
431431

432432
if requires:
433433
# use unsuffixed names for components provided by this wrapper
@@ -445,8 +445,8 @@ def install_pc_files(self):
445445
pc_file['libs'] = "Libs: -L${libdir} -l%s" % c_lib_name
446446
pc_file['cflags'] = "Cflags: -I${includedir}"
447447
# infer private libs through pkg-config
448-
linker_libs, _ = run_cmd("pkg-config --libs %s" % pc_name, simple=False)
449-
all_libs, _ = run_cmd("pkg-config --libs --static %s" % pc_name, simple=False)
448+
linker_libs, _ = run_cmd("pkg-config --libs %s" % pc_name, simple=False, log_ok=False)
449+
all_libs, _ = run_cmd("pkg-config --libs --static %s" % pc_name, simple=False, log_ok=False)
450450
libs_priv = "%s " % all_libs.rstrip()
451451
for flag in linker_libs.rstrip().split(' '):
452452
libs_priv = libs_priv.replace("%s " % flag, '')

0 commit comments

Comments
 (0)