Skip to content

Commit 9a891f8

Browse files
committed
[#3731] Addressed comments
1 parent dc1a5c2 commit 9a891f8

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

config-report.sh.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ Python:
4242
4343
Boost: @BOOST_VERSION@
4444
45-
@CRYPTO_NAME@:
46-
VERSION: @CRYPTO_VERSION@
45+
@CRYPTO_NAME@:@SPACES@@CRYPTO_VERSION@
4746
4847
Log4cplus: @LOG4CPLUS_VERSION@
4948
@@ -111,7 +110,8 @@ fi
111110

112111
add_to_report '
113112
Developer:
114-
Tests: @TESTS_ENABLED@
115-
Fuzzing: @FUZZ_ENABLED@
116-
AFL: @HAVE_AFL@
113+
Tests: @TESTS_ENABLED@
114+
Fuzzing: @FUZZ_ENABLED@
115+
Valgrind: @VALGRIND@
116+
AFL: @HAVE_AFL@
117117
'

meson.build

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ if result.returncode() == 0
539539
else
540540
report_conf_data.set('CXX_VERSION', 'unknown')
541541
endif
542+
# The required keyword in cpp.run() is an 1.5.0 feature.
542543
result = cpp.run(
543544
fs.read('compiler-checks/get-cpp-standard.cc'),
544545
name: 'Get cpp standard',
@@ -566,6 +567,7 @@ else
566567
endif
567568
if CRYPTO_DEP.name() == botan.name()
568569
report_conf_data.set('CRYPTO_NAME', 'Botan')
570+
report_conf_data.set('SPACES', ' ')
569571
result = cpp.run(
570572
fs.read('compiler-checks/get-botan-version.cc'),
571573
name: 'Get Botan version',
@@ -582,6 +584,7 @@ if CRYPTO_DEP.name() == botan.name()
582584
report_conf_data.set('CRYPTO_VERSION', version)
583585
elif CRYPTO_DEP.name() == openssl.name()
584586
report_conf_data.set('CRYPTO_NAME', 'OpenSSL')
587+
report_conf_data.set('SPACES', ' ')
585588
result = cpp.run(
586589
fs.read('compiler-checks/get-openssl-version.cc'),
587590
name: 'Get OpenSSL version',
@@ -727,6 +730,11 @@ if FUZZ_OPT.enabled()
727730
else
728731
report_conf_data.set('FUZZ_ENABLED', 'disabled')
729732
endif
733+
if valgrind.found()
734+
report_conf_data.set('VALGRIND', valgrind.full_path())
735+
else
736+
report_conf_data.set('VALGRIND', 'no')
737+
endif
730738
if have_afl
731739
report_conf_data.set('HAVE_AFL', 'yes')
732740
else

0 commit comments

Comments
 (0)