`Makefile.mk` supported MS-DOS and Amiga, but `./configure` also
supported them in a better tested and more flexible way.
This patch also adds CMake support for MS-DOS/DJGPP and Amiga OS 3.
`Makefile.mk` was not maintained. Delete it in favour of first-tier
build methods.
Also include some non-MS-DOS/AmigaOS-specific tidy-up, see details at
the end of this message.
Details:
- fix/silence all MS-DOS/DJGPP build warnings and issues.
- add MS-DOS support to cmake.
- default to `ENABLE_THREADED_RESOLVER=OFF` for MS-DOS.
- add support for `WATT_ROOT`.
- use static libcurl with MS-DOS.
- fixup default CMake suffixes/prefixes for DJGPP.
- disable hidden symbols for MS-DOS. Not supported on MS-DOS.
- opt-in MS-DOS into `USE_UNIX_SOCKETS`.
- improve MS-DOS support in autotools.
- default to `--disable-threaded-resolver` for MS-DOS.
- make sure to use `close_s()` (from Watt-32) with autotools and cmake.
`Makefile.mk` used it before this patch.
- GHA: add DJGPP cmake (~30s) and autotools (~60s) build jobs.
Also build tests and examples with cmake.
- improve AmigaOS support in autotools:
- configure: detect `CloseSocket()` when it's a macro.
- configure: fix `IoctlSocket` detection on AmigaOS.
- curl-amissl.m4: pass AmiSSL libs to tests/servers.
- add AmigaOS3 support to cmake:
- cmake: fix `HAVE_IOCTLSOCKET_CAMEL` and
`HAVE_IOCTLSOCKET_CAMEL_FIONBIO` detections.
- set necessary system libs.
- add AmiSSL support.
- inet_ntop, inet_pton: fix using it for AmigaOS. cmake detects them,
and they did not compile with AmigaOS.
- cmake: better sync `gethostname` detection with autotools.
Fixes detection for AmigaOS, where `gethostname` is a macro.
- cmake: fix `sys/utime.h` detection on AmigaOS.
- cmake: force-disable `getaddrinfo` for AmigaOS.
- cmake: tweak threading and static/shared default for AmigaOS.
- cmake: rely on manual variable `AMIGA` to enable the platform.
- GHA: add AmigaOS cmake and autotools (~45s) jobs.
Also build tests and examples with cmake.
- INSTALL: update MS-DOS and AmigaOS build instructions.
- amigaos: fix `-Wpointer-sign` and
`zero or negative size array '_args'` in `Printf()`.
- amigaos: fix `-Wpointer-sign`
- amigaos: fix `-Wredundant-decls` `errno` and `h_errno`.
- amigaos: brute-force silence `lseek()` size warnings.
- amigaos: server/resolve: silence `-Wdiscarded-qualifiers`.
- amigaos: server/resolve: fix `-Wpointer-sign`.
- amigaos: fix `CURL_SA_FAMILY_T` type.
- nonblock: prefer `HAVE_IOCTLSOCKET_CAMEL_FIONBIO` for AmigaOS.
`ioctl` is also detected, but fails when used. Make the above override
it for a successful build.
Authored-by: Darren Banfi
Fixes #15537
Closes #15603
- tftpd: prefer `HAVE_IOCTLSOCKET_CAMEL_FIONBIO` for AmigaOS.
- tftpd: tidy-up conditional code.
- curl: set stack size to 16384 for AmigaOS3/4
Overriding the default 4096.
Suggested-by: Darren Banfi
Ref: https://github.com/curl/curl/pull/15543#issuecomment-2498783123
Ref: https://wiki.amigaos.net/wiki/Controlling_Application_Stack
- functypes.h: fix `SEND_QUAL_ARG2` for AmigaOS.
- tftp: add missing cast in sendto() call for AmigaOS.
- getinfo: fix warning with AmigaOS.
- tool_operate: silence warning with AmigaOS
- amigaos: fix building libtests due to missing `RLIMIT_NOFILE`.
- curl_gethostname: silence warning for AmigaOS.
- ftp: silence `-Wtype-limits` for AmigaOS.
- libtest: fix timeval initialization for AmigaOS.
- examples: fix `timeval` initialization for AmigaOS.
- examples: silence warning for AmigaOS.
- configure: fix IPv6 detection for cross-builds.
- netrc: fix to build with AmigaOS cleanly.
- buildinfo: detect and add `DOS` tag for MS-DOS builds.
- buildinfo: add `AMIGA` to buildinfo.txt in auttools.
- build: move `USE_WATT32` macro definition to cmake/configure.
Non-MS-DOS/AmigeOS-specific tidy-ups:
- configure: sync `sa_family_t` detection with cmake.
- configure: sync `ADDRESS_FAMILY` detection signals with cmake.
- doh: use `CURL_SA_FAMILY_T`.
- lib: drop mingw-specific `CURL_SA_FAMILY_T` workaround.
- cmake: extend instead of override check-specific
configurations/requirements.
This allows to honor global requirements added earlier.
Necessary for AmigaOS for example.
- cmake: omit warning on disabled IPv6 for MS-DOS and AmigaOS.
No IPv6 support on these platforms. Also sync with autotools.
- lib1960: use libcurl `inet_pton()` wrapper.
- cmake: detect LibreSSL (to match autotools).
- cmake: say the specific OpenSSL flavour detected.
- hostip: add missing `HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID` guard.
- lib: simplify classic mac feature guards.
Follow-up to a8861b6ccd #9764
Closes #15543
145 lines
4.6 KiB
Perl
Executable File
145 lines
4.6 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 GETHOSTNAME_TYPE_ARG2 int' => 1,
|
|
'#define GETHOSTNAME_TYPE_ARG2 size_t' => 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_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;
|