Commit 6bef602005 for openssl.org
commit 6bef6020054899f973d7eccff775da61705c0101
Author: leejongyoung <leejongyoung@icloud.com>
Date: Mon Oct 26 00:06:37 2026 +0900
configdata.pm.in: skip apps configuration.h when apps are disabled
With no-apps, the apps directory is skipped while the build tree
is populated, so, with out-of-tree build, there is no apps/include
directory for configdata to write apps/include/configuration.h into.
Skip its creation, as it is not needed either, since nothing is built
in apps/ in that case.
Also correct the file name in the failure message: the open() call
that fails is for ${configuration_file}.new,
not ${configuration_file_in}.new.
Resolves: https://github.com/openssl/openssl/issues/33386
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Merge-date: Wed Oct 28 10:58:31 2026
Merged-from: https://github.com/openssl/openssl/pull/33390
diff --git a/configdata.pm.in b/configdata.pm.in
index a21fe686d9..4d6b17f10f 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -155,7 +155,7 @@ _____
my ($configuration_file, $configuration_file_in) = @_;
open CONFIGURATION, ">${configuration_file}.new"
- or die "Trying to create ${configuration_file_in}.new: $!";
+ or die "Trying to create ${configuration_file}.new: $!";
$tmpl = OpenSSL::Template->new(TYPE => 'FILE',
SOURCE => $configuration_file_in);
$tmpl->fill_in(FILENAME => $_,
@@ -218,8 +218,14 @@ _____
$create_configuration->($configuration_h, $configuration_h_in);
$update_configuration->($configuration_h, $configuration_h_in);
- $create_configuration->($apps_configuration_h, $apps_configuration_h_in);
- $update_configuration->($apps_configuration_h, $apps_configuration_h_in);
+ # With no-apps, the apps directory is skipped when the build tree
+ # is populated, so out of source there is no directory to write
+ # this file in. It isn't needed either, as nothing gets built
+ # in apps/ in that case.
+ unless ($disabled{apps}) {
+ $create_configuration->($apps_configuration_h, $apps_configuration_h_in);
+ $update_configuration->($apps_configuration_h, $apps_configuration_h_in);
+ }
exit(0);
}