`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
413 lines
8.4 KiB
C
413 lines
8.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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
|
|
*
|
|
***************************************************************************/
|
|
|
|
#ifdef HAVE_FCNTL_O_NONBLOCK
|
|
/* headers for FCNTL_O_NONBLOCK test */
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
/* */
|
|
#if defined(sun) || defined(__sun__) || \
|
|
defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
# if defined(__SVR4) || defined(__srv4__)
|
|
# define PLATFORM_SOLARIS
|
|
# else
|
|
# define PLATFORM_SUNOS4
|
|
# endif
|
|
#endif
|
|
#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX41)
|
|
# define PLATFORM_AIX_V3
|
|
#endif
|
|
/* */
|
|
#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3)
|
|
#error "O_NONBLOCK does not work on this platform"
|
|
#endif
|
|
|
|
int main(void)
|
|
{
|
|
/* O_NONBLOCK source test */
|
|
int flags = 0;
|
|
if(0 != fcntl(0, F_SETFL, flags | O_NONBLOCK))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
/* tests for gethostbyname_r */
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3_REENTRANT) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_5_REENTRANT) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_6_REENTRANT)
|
|
# define _REENTRANT
|
|
/* no idea whether _REENTRANT is always set, just invent a new flag */
|
|
# define TEST_GETHOSTBYFOO_REENTRANT
|
|
#endif
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_5) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_6) || \
|
|
defined(TEST_GETHOSTBYFOO_REENTRANT)
|
|
#include <sys/types.h>
|
|
#include <netdb.h>
|
|
int main(void)
|
|
{
|
|
char *address = "example.com";
|
|
int length = 0;
|
|
int type = 0;
|
|
struct hostent h;
|
|
int rc = 0;
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_3_REENTRANT)
|
|
struct hostent_data hdata;
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_5) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_5_REENTRANT) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_6) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_6_REENTRANT)
|
|
char buffer[8192];
|
|
int h_errnop;
|
|
struct hostent *hp;
|
|
#endif
|
|
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_3_REENTRANT)
|
|
rc = gethostbyname_r(address, &h, &hdata);
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_5) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_5_REENTRANT)
|
|
rc = gethostbyname_r(address, &h, buffer, 8192, &h_errnop);
|
|
(void)hp; /* not used for test */
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_6) || \
|
|
defined(HAVE_GETHOSTBYNAME_R_6_REENTRANT)
|
|
rc = gethostbyname_r(address, &h, buffer, 8192, &hp, &h_errnop);
|
|
#endif
|
|
|
|
(void)length;
|
|
(void)type;
|
|
(void)rc;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_IN_ADDR_T
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <arpa/inet.h>
|
|
int main(void)
|
|
{
|
|
if((in_addr_t *) 0)
|
|
return 0;
|
|
if(sizeof(in_addr_t))
|
|
return 0;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_BOOL_T
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_STDBOOL_H
|
|
#include <stdbool.h>
|
|
#endif
|
|
int main(void)
|
|
{
|
|
if(sizeof(bool *))
|
|
return 0;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef STDC_HEADERS
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
#include <float.h>
|
|
int main(void) { return 0; }
|
|
#endif
|
|
|
|
#ifdef HAVE_FILE_OFFSET_BITS
|
|
#ifdef _FILE_OFFSET_BITS
|
|
#undef _FILE_OFFSET_BITS
|
|
#endif
|
|
#define _FILE_OFFSET_BITS 64
|
|
#include <sys/types.h>
|
|
/* Check that off_t can represent 2**63 - 1 correctly.
|
|
We cannot simply define LARGE_OFF_T to be 9223372036854775807,
|
|
since some C++ compilers masquerading as C compilers
|
|
incorrectly reject 9223372036854775807. */
|
|
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
|
|
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
|
|
&& LARGE_OFF_T % 2147483647 == 1)
|
|
? 1 : -1];
|
|
int main(void) { return 0; }
|
|
#endif
|
|
|
|
#ifdef HAVE_IOCTLSOCKET
|
|
/* includes start */
|
|
#ifdef _WIN32
|
|
# include <winsock2.h>
|
|
#endif
|
|
int main(void)
|
|
{
|
|
/* ioctlsocket source code */
|
|
int socket;
|
|
unsigned long flags = ioctlsocket(socket, FIONBIO, &flags);
|
|
;
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_IOCTLSOCKET_CAMEL
|
|
/* includes start */
|
|
#include <proto/bsdsocket.h>
|
|
int main(void)
|
|
{
|
|
/* IoctlSocket source code */
|
|
if(0 != IoctlSocket(0, 0, 0))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_IOCTLSOCKET_CAMEL_FIONBIO
|
|
/* includes start */
|
|
#include <proto/bsdsocket.h>
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
# include <sys/ioctl.h>
|
|
#endif
|
|
int main(void)
|
|
{
|
|
/* IoctlSocket source code */
|
|
long flags = 0;
|
|
if(0 != IoctlSocket(0, FIONBIO, &flags))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_IOCTLSOCKET_FIONBIO
|
|
/* includes start */
|
|
#ifdef _WIN32
|
|
# include <winsock2.h>
|
|
#endif
|
|
int main(void)
|
|
{
|
|
unsigned long flags = 0;
|
|
if(0 != ioctlsocket(0, FIONBIO, &flags))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_IOCTL_FIONBIO
|
|
/* headers for FIONBIO test */
|
|
/* includes start */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
# include <sys/socket.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
# include <sys/ioctl.h>
|
|
#endif
|
|
#ifdef HAVE_STROPTS_H
|
|
# include <stropts.h>
|
|
#endif
|
|
int main(void)
|
|
{
|
|
int flags = 0;
|
|
if(0 != ioctl(0, FIONBIO, &flags))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_IOCTL_SIOCGIFADDR
|
|
/* headers for FIONBIO test */
|
|
/* includes start */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
# include <sys/socket.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
# include <sys/ioctl.h>
|
|
#endif
|
|
#ifdef HAVE_STROPTS_H
|
|
# include <stropts.h>
|
|
#endif
|
|
#include <net/if.h>
|
|
int main(void)
|
|
{
|
|
struct ifreq ifr;
|
|
if(0 != ioctl(0, SIOCGIFADDR, &ifr))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_SETSOCKOPT_SO_NONBLOCK
|
|
/* includes start */
|
|
#ifdef _WIN32
|
|
# include <winsock2.h>
|
|
#endif
|
|
/* includes start */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SOCKET_H
|
|
# include <sys/socket.h>
|
|
#endif
|
|
/* includes end */
|
|
int main(void)
|
|
{
|
|
if(0 != setsockopt(0, SOL_SOCKET, SO_NONBLOCK, 0, 0))
|
|
return 1;
|
|
;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_GLIBC_STRERROR_R
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
void check(char c) {}
|
|
|
|
int main(void)
|
|
{
|
|
char buffer[1024];
|
|
/* This will not compile if strerror_r does not return a char* */
|
|
check(strerror_r(EACCES, buffer, sizeof(buffer))[0]);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_POSIX_STRERROR_R
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
|
|
/* Float, because a pointer cannot be implicitly cast to float */
|
|
void check(float f) {}
|
|
|
|
int main(void)
|
|
{
|
|
char buffer[1024];
|
|
/* This will not compile if strerror_r does not return an int */
|
|
check(strerror_r(EACCES, buffer, sizeof(buffer)));
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_FSETXATTR_6
|
|
#include <sys/xattr.h> /* header from libc, not from libattr */
|
|
int main(void)
|
|
{
|
|
fsetxattr(0, 0, 0, 0, 0, 0);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_FSETXATTR_5
|
|
#include <sys/xattr.h> /* header from libc, not from libattr */
|
|
int main(void)
|
|
{
|
|
fsetxattr(0, 0, 0, 0, 0);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_CLOCK_GETTIME_MONOTONIC
|
|
#include <time.h>
|
|
int main(void)
|
|
{
|
|
struct timespec ts = {0, 0};
|
|
clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_BUILTIN_AVAILABLE
|
|
int main(void)
|
|
{
|
|
if(__builtin_available(macOS 10.12, iOS 5.0, *)) {}
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_ATOMIC
|
|
/* includes start */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
#ifdef HAVE_UNISTD_H
|
|
# include <unistd.h>
|
|
#endif
|
|
#ifdef HAVE_STDATOMIC_H
|
|
# include <stdatomic.h>
|
|
#endif
|
|
/* includes end */
|
|
|
|
int main(void)
|
|
{
|
|
_Atomic int i = 1;
|
|
i = 0; /* Force an atomic-write operation. */
|
|
return i;
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_WIN32_WINNT
|
|
/* includes start */
|
|
#ifdef _WIN32
|
|
# ifndef NOGDI
|
|
# define NOGDI
|
|
# endif
|
|
# include <windows.h>
|
|
#endif
|
|
/* includes end */
|
|
|
|
#define enquote(x) #x
|
|
#define expand(x) enquote(x)
|
|
#pragma message("_WIN32_WINNT=" expand(_WIN32_WINNT))
|
|
|
|
int main(void)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|