From: Pauli Date: Wed, 16 Apr 2025 07:10:35 +0000 (+1000) Subject: params: don't build removed file X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b747a48bb17e5e1cda594dd8fcbb8f7ca3bf4eaf;p=thirdparty%2Fopenssl.git params: don't build removed file Reviewed-by: Dmitry Belyavskiy Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/27392) --- diff --git a/build.info b/build.info index 22c7c8a94b1..329f0124637 100644 --- a/build.info +++ b/build.info @@ -48,7 +48,7 @@ DEPEND[]=include/openssl/asn1.h \ include/openssl/x509_acert.h \ include/openssl/x509_vfy.h \ include/crypto/bn_conf.h include/crypto/dso_conf.h \ - include/internal/param_names.h crypto/params_idx.c + include/internal/param_names.h GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in GENERATE[include/openssl/asn1t.h]=include/openssl/asn1t.h.in @@ -83,10 +83,8 @@ GENERATE[include/openssl/x509_vfy.h]=include/openssl/x509_vfy.h.in GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in -DEPEND[crypto/params_idx.c \ - include/internal/param_names.h \ +DEPEND[include/internal/param_names.h \ include/openssl/core_names.h]=util/perl|OpenSSL/paramnames.pm -GENERATE[crypto/params_idx.c]=crypto/params_idx.c.in GENERATE[include/internal/param_names.h]=include/internal/param_names.h.in GENERATE[include/openssl/core_names.h]=include/openssl/core_names.h.in diff --git a/include/internal/param_names.h.in b/include/internal/param_names.h.in index f34db21951c..d7b95d4035b 100644 --- a/include/internal/param_names.h.in +++ b/include/internal/param_names.h.in @@ -8,11 +8,8 @@ * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ +/* Parameter name definitions - generated by util/perl/OpenSSL/paramnames.pm */ {- use OpenSSL::paramnames qw(generate_internal_macros); --} - -int ossl_param_find_pidx(const char *s); -/* Parameter name definitions - generated by util/perl/OpenSSL/paramnames.pm */ -{- generate_internal_macros(); -} +generate_internal_macros(); -}