- cmp-config.pl: add remaining exceptions. Sort list. - drop unused `HAVE_SYS_WAIT_H`. Follow-up to50def7c881#13249 - drop unused `HAVE_FCHMOD`. Follow-up to03cb1ff4d6#12395 - autotools: stop promoting variables to macros: `USE_NGTCP2_CRYPTO_*`, `USE_NGTCP2_H3`, `USE_OPENSSL_H3`, `HAVE_LIBRESSL`. They are not used in the source. - cmake: drop unused `HAVE_O_NONBLOCK`, `HAVE_DISABLED_NONBLOCKING`. - lib: drop `NEED_MALLOC_H`. It was used in manual-build cases for Amiga/MS-DOS/Windows/WinCE, but never by autotools/cmake, thus apparently unnecessary. - lib: drop unused `NEED_MEMORY_H`. - lib: simplify classic mac feature guards, drop `HAVE_EXTRA_STRICMP_H` and `HAVE_EXTRA_STRDUP_H`. - autotools: drop unused `HAVE_GETHOSTBYNAME` detection. - autotools: drop unused OpenSSL feature tests: `HAVE_ERR_H`, `HAVE_PEM_H`, `HAVE_RSA_H` - autotools: drop unused OpenSSL feature tests: `HAVE_X509_H`, `HAVE_CRYPTO_H`, `HAVE_SSL_H`. They performed a fallback check when the primary check missed `openssl/x509.h`. Though if any other prefixed headers were found, OpenSSL is already assumed detected. The fallback check was looking for 3 unprefixed OpenSSL headers, and if all found, marked OpenSSL found internally, but did not promote it to `curl_config.h` via `USE_OPENSSL`. Meaning it either didn't do anything or may have continued with an inconsistent state. Added ind99c20f628(2008) At the time, there was an extra `AC_DEFINE(USE_SSLEAY, 1 ...` logic after this code, which kicked in in the fallback case, but that code was deleted in709cf76f6b(2015) Follow-up to709cf76f6b- autotools: drop `AC_SUBST()` where the value is explicitly set anyway and the macro is unused. - autotools: replace `AC_SUBST(VAR, 1)` with local variable assigments, where the `@VAR@` macro is unused. Also dedupe the local variable if there was a parallel one used for the same purpose. - autotools: drop local feature variables that were never used. - autotools: drop unused `CURL_CHECK_OPTION_NTLM_WB`, `CURL_CHECK_NTLM_WB`. Also stop setting unused `NTLM_WB_ENABLED` macro for VMS. Follow-up to50def7c881#13249 - autotools: drop unused `PKGADD_*`. Follow-up tobae0d473f5#3331 - autotools: drop unused `CURL_NETWORK_LIBS`. Follow-up to3af75e18d6#14697 Closes #15577
149 lines
4.8 KiB
Perl
Executable File
149 lines
4.8 KiB
Perl
Executable File
#!/usr/bin/env perl
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
|
|
my $autotools = $ARGV[0];
|
|
my $cmake = $ARGV[1];
|
|
|
|
if(!$cmake) {
|
|
print "Usage: cmp-config <config1> <config2.h>\n";
|
|
exit;
|
|
}
|
|
|
|
# this lists complete lines that will be removed from the output if
|
|
# matching
|
|
my %remove = (
|
|
'#define CURL_EXTERN_SYMBOL' => 1,
|
|
'#define CURL_OS "Linux"' => 1,
|
|
'#define CURL_OS "x86_64-pc-linux-gnu"' => 1,
|
|
'#define CURL_SA_FAMILY_T ADDRESS_FAMILY' => 1,
|
|
'#define CURL_SA_FAMILY_T sa_family_t' => 1,
|
|
'#define GETHOSTNAME_TYPE_ARG2 int' => 1,
|
|
'#define GETHOSTNAME_TYPE_ARG2 size_t' => 1,
|
|
'#define HAVE_ADDRESS_FAMILY 1' => 1,
|
|
'#define HAVE_BROTLI 1' => 1,
|
|
'#define HAVE_BROTLI_DECODE_H 1' => 1,
|
|
'#define HAVE_DECL_GETPWUID_R 0' => 1,
|
|
'#define HAVE_DECL_GETPWUID_R 1' => 1,
|
|
'#define HAVE_DECL_GETPWUID_R_MISSING 1' => 1,
|
|
'#define HAVE_DLFCN_H 1' => 1,
|
|
'#define HAVE_GSSAPI_GSSAPI_KRB5_H 1' => 1,
|
|
'#define HAVE_INTTYPES_H 1' => 1,
|
|
'#define HAVE_IOCTL 1' => 1,
|
|
'#define HAVE_LDAP_H 1' => 1,
|
|
'#define HAVE_LDAP_SSL 1' => 1,
|
|
'#define HAVE_LIBBROTLIDEC 1' => 1,
|
|
'#define HAVE_LIBPSL_H 1' => 1,
|
|
'#define HAVE_LIBRTMP_RTMP_H 1' => 1,
|
|
'#define HAVE_LIBSOCKET 1' => 1,
|
|
'#define HAVE_LIBSSH' => 1,
|
|
'#define HAVE_LIBSSH2 1' => 1,
|
|
'#define HAVE_LIBSSL 1' => 1,
|
|
'#define HAVE_LIBWOLFSSH' => 1,
|
|
'#define HAVE_LIBZSTD 1' => 1,
|
|
'#define HAVE_MSH3_H 1' => 1,
|
|
'#define HAVE_NGHTTP2_NGHTTP2_H 1' => 1,
|
|
'#define HAVE_NGHTTP3_NGHTTP3_H 1' => 1,
|
|
'#define HAVE_NGTCP2_NGTCP2_CRYPTO_H 1' => 1,
|
|
'#define HAVE_NGTCP2_NGTCP2_H 1' => 1,
|
|
'#define HAVE_OPENSSL_CRYPTO_H 1' => 1,
|
|
'#define HAVE_OPENSSL_ERR_H 1' => 1,
|
|
'#define HAVE_OPENSSL_PEM_H 1' => 1,
|
|
'#define HAVE_OPENSSL_RSA_H 1' => 1,
|
|
'#define HAVE_OPENSSL_SSL_H 1' => 1,
|
|
'#define HAVE_OPENSSL_X509_H 1' => 1,
|
|
'#define HAVE_QUICHE_H 1' => 1,
|
|
'#define HAVE_SA_FAMILY_T 1' => 1,
|
|
'#define HAVE_SETJMP_H 1' => 1,
|
|
'#define HAVE_SSL_ECH_SET1_ECHCONFIG 1' => 1,
|
|
'#define HAVE_SSL_SET1_ECH_CONFIG_LIST 1' => 1,
|
|
'#define HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT 1' => 1,
|
|
'#define HAVE_STDINT_H 1' => 1,
|
|
'#define HAVE_STDIO_H 1' => 1,
|
|
'#define HAVE_STDLIB_H 1' => 1,
|
|
'#define HAVE_STRING_H 1' => 1,
|
|
'#define HAVE_SYS_XATTR_H 1' => 1,
|
|
'#define HAVE_UNICODE_UIDNA_H 1' => 1,
|
|
'#define HAVE_WOLFSSH_SSH_H 1' => 1,
|
|
'#define HAVE_WOLFSSL_CTX_GENERATEECHCONFIG 1' => 1,
|
|
'#define HAVE_ZSTD 1' => 1,
|
|
'#define HAVE_ZSTD_H 1' => 1,
|
|
'#define LT_OBJDIR ".libs/"' => 1,
|
|
'#define NEED_LBER_H 1' => 1,
|
|
'#define PACKAGE "curl"' => 1,
|
|
'#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"' => 1,
|
|
'#define PACKAGE_NAME "curl"' => 1,
|
|
'#define PACKAGE_STRING "curl -"' => 1,
|
|
'#define PACKAGE_TARNAME "curl"' => 1,
|
|
'#define PACKAGE_URL ""' => 1,
|
|
'#define PACKAGE_VERSION "-"' => 1,
|
|
'#define SIZEOF_LONG_LONG 8' => 1,
|
|
'#define VERSION "-"' => 1,
|
|
'#define _FILE_OFFSET_BITS 64' => 1,
|
|
);
|
|
|
|
sub filter {
|
|
my ($line) = @_;
|
|
if(!$remove{$line}) {
|
|
return "$line\n";
|
|
}
|
|
$remove{$line}++;
|
|
return "";
|
|
}
|
|
|
|
sub grepit {
|
|
my ($input, $output) = @_;
|
|
my @defines;
|
|
# first get all the #define lines
|
|
open(F, "<$input");
|
|
while(<F>) {
|
|
if($_ =~ /^#def/) {
|
|
chomp;
|
|
push @defines, $_;
|
|
}
|
|
}
|
|
close(F);
|
|
|
|
open(O, ">$output");
|
|
|
|
# output the sorted list through the filter
|
|
foreach my $d(sort @defines) {
|
|
print O filter($d);
|
|
}
|
|
close(O);
|
|
}
|
|
|
|
grepit($autotools, "/tmp/autotools");
|
|
grepit($cmake, "/tmp/cmake");
|
|
|
|
foreach my $v (keys %remove) {
|
|
if($remove{$v} == 1) {
|
|
print "Ignored, never matched line: $v\n";
|
|
}
|
|
}
|
|
|
|
|
|
# return the exit code from diff
|
|
exit system("diff -u /tmp/autotools /tmp/cmake") >> 8;
|