mirror of
https://github.com/curl/curl.git
synced 2026-07-30 20:18:08 +03:00
Makefile.mk: drop in favour of autotools and cmake (MS-DOS, AmigaOS3)
`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
This commit is contained in:
parent
607bec04d9
commit
a3585c9576
74 changed files with 734 additions and 1019 deletions
|
|
@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
|
|||
.DELETE_ON_ERROR:
|
||||
|
||||
EXTRA_DIST = mk-file-embed.pl mkhelp.pl \
|
||||
Makefile.mk curl.rc Makefile.inc CMakeLists.txt .checksrc
|
||||
curl.rc Makefile.inc CMakeLists.txt .checksrc
|
||||
|
||||
# Specify our include paths here, and do it relative to $(top_srcdir) and
|
||||
# $(top_builddir), to ensure that these paths which belong to the library
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
#***************************************************************************
|
||||
# _ _ ____ _
|
||||
# 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
|
||||
#
|
||||
#***************************************************************************
|
||||
|
||||
# See usage in lib/Makefile.mk
|
||||
|
||||
PROOT := ..
|
||||
|
||||
### Common
|
||||
|
||||
include $(PROOT)/lib/Makefile.mk
|
||||
|
||||
### Local
|
||||
|
||||
CPPFLAGS += -I$(PROOT)/lib
|
||||
LDFLAGS += -L$(PROOT)/lib
|
||||
LIBS := -lcurl $(LIBS)
|
||||
|
||||
### Sources and targets
|
||||
|
||||
# Provides CURL_CFILES, CURLX_CFILES
|
||||
include Makefile.inc
|
||||
|
||||
TARGETS := curl$(BIN_EXT)
|
||||
|
||||
CURL_CFILES += $(notdir $(CURLX_CFILES))
|
||||
|
||||
ifneq ($(CURL_CA_EMBED),)
|
||||
CPPFLAGS += -DCURL_CA_EMBED
|
||||
CURL_CFILES += tool_ca_embed.c
|
||||
endif
|
||||
|
||||
curl_OBJECTS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(strip $(CURL_CFILES)))
|
||||
ifdef MAP
|
||||
CURL_MAP := curl.map
|
||||
LDFLAGS += -Wl,-Map,$(CURL_MAP)
|
||||
TOVCLEAN := $(CURL_MAP)
|
||||
endif
|
||||
vpath %.c $(PROOT)/lib
|
||||
|
||||
TOCLEAN := $(curl_OBJECTS)
|
||||
|
||||
### Rules
|
||||
|
||||
PERL ?= perl
|
||||
|
||||
ifneq ($(wildcard tool_hugehelp.c.cvs),)
|
||||
TOCLEAN += tool_hugehelp.c
|
||||
# Load DPAGES
|
||||
include $(PROOT)/docs/cmdline-opts/Makefile.inc
|
||||
$(PROOT)/docs/cmdline-opts/curl.txt: $(addprefix $(PROOT)/docs/cmdline-opts/,$(DPAGES)) $(PROOT)/scripts/managen
|
||||
cd $(PROOT)/docs/cmdline-opts && $(PERL) ../../scripts/managen ascii $(DPAGES) > curl.txt
|
||||
# Necessary for the generated tools_hugehelp.c
|
||||
CPPFLAGS += -DUSE_MANUAL
|
||||
ifdef ZLIB
|
||||
_MKHELPOPT += -c
|
||||
endif
|
||||
tool_hugehelp.c: $(PROOT)/docs/cmdline-opts/curl.txt mkhelp.pl
|
||||
$(PERL) mkhelp.pl $(_MKHELPOPT) < $< > $@
|
||||
else
|
||||
tool_hugehelp.c:
|
||||
@echo Creating $@
|
||||
@$(call COPY, $@.cvs, $@)
|
||||
endif
|
||||
|
||||
ifneq ($(CURL_CA_EMBED),)
|
||||
TOCLEAN += tool_ca_embed.c
|
||||
tool_ca_embed.c: mk-file-embed.pl
|
||||
$(PERL) mk-file-embed.pl --var curl_ca_embed < $(CURL_CA_EMBED) > $@
|
||||
endif
|
||||
|
||||
$(TARGETS): $(curl_OBJECTS) $(PROOT)/lib/libcurl.a
|
||||
$(CC) $(LDFLAGS) -o $@ $(curl_OBJECTS) $(LIBS)
|
||||
|
||||
all: $(OBJ_DIR) $(TARGETS)
|
||||
|
|
@ -74,7 +74,14 @@ size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
|
|||
timeout.tv_usec = (int)((wait%1000)*1000);
|
||||
|
||||
FD_ZERO(&bits);
|
||||
#if defined(__DJGPP__)
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Warith-conversion"
|
||||
#endif
|
||||
FD_SET(per->infd, &bits);
|
||||
#if defined(__DJGPP__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
if(!select(per->infd + 1, &bits, NULL, NULL, &timeout))
|
||||
return 0; /* timeout */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,7 +80,11 @@ int tool_seek_cb(void *userdata, curl_off_t offset, int whence)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef __AMIGA__
|
||||
if(LSEEK_ERROR == lseek(per->infd, (off_t)offset, whence))
|
||||
#else
|
||||
if(LSEEK_ERROR == lseek(per->infd, offset, whence))
|
||||
#endif
|
||||
/* could not rewind, the reason is in errno but errno is just not portable
|
||||
enough and we do not actually care that much why we failed. We will let
|
||||
libcurl know that it may try other means if it wants to. */
|
||||
|
|
|
|||
|
|
@ -242,7 +242,8 @@ SANITIZE_ERR_OK: Good -- 'path' can be truncated
|
|||
SANITIZE_ERR_INVALID_PATH: Bad -- 'path' cannot be truncated
|
||||
!= SANITIZE_ERR_OK && != SANITIZE_ERR_INVALID_PATH: Error
|
||||
*/
|
||||
SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos)
|
||||
static SANITIZEcode truncate_dryrun(const char *path,
|
||||
const size_t truncate_pos)
|
||||
{
|
||||
size_t len;
|
||||
|
||||
|
|
@ -291,8 +292,8 @@ sanitize_file_name.
|
|||
Success: (SANITIZE_ERR_OK) *sanitized points to a sanitized copy of file_name.
|
||||
Failure: (!= SANITIZE_ERR_OK) *sanitized is NULL.
|
||||
*/
|
||||
SANITIZEcode msdosify(char **const sanitized, const char *file_name,
|
||||
int flags)
|
||||
static SANITIZEcode msdosify(char **const sanitized, const char *file_name,
|
||||
int flags)
|
||||
{
|
||||
char dos_name[PATH_MAX];
|
||||
static const char illegal_chars_dos[] = ".+, ;=[]" /* illegal in DOS */
|
||||
|
|
|
|||
|
|
@ -40,14 +40,6 @@ typedef enum {
|
|||
|
||||
SANITIZEcode sanitize_file_name(char **const sanitized, const char *file_name,
|
||||
int flags);
|
||||
#ifdef UNITTESTS
|
||||
SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos);
|
||||
SANITIZEcode msdosify(char **const sanitized, const char *file_name,
|
||||
int flags);
|
||||
SANITIZEcode rename_if_reserved_dos_device_name(char **const sanitized,
|
||||
const char *file_name,
|
||||
int flags);
|
||||
#endif /* UNITTESTS */
|
||||
|
||||
#if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__))
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,9 @@
|
|||
#include "tool_setup.h"
|
||||
|
||||
#ifdef HAVE_PWD_H
|
||||
# undef __NO_NET_API /* required for building for AmigaOS */
|
||||
# include <pwd.h>
|
||||
#undef __NO_NET_API /* required for AmigaOS to declare getpwuid() */
|
||||
#include <pwd.h>
|
||||
#define __NO_NET_API
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
|
|
|
|||
|
|
@ -45,10 +45,6 @@
|
|||
|
||||
#include "memdebug.h" /* keep this as LAST include */
|
||||
|
||||
#ifdef MSDOS
|
||||
# define USE_WATT32
|
||||
#endif
|
||||
|
||||
#define ALLOW_BLANK TRUE
|
||||
#define DENY_BLANK FALSE
|
||||
|
||||
|
|
|
|||
|
|
@ -36,10 +36,6 @@
|
|||
|
||||
#include "memdebug.h" /* keep this as LAST include */
|
||||
|
||||
#ifdef MSDOS
|
||||
# define USE_WATT32
|
||||
#endif
|
||||
|
||||
#ifndef ARRAYSIZE
|
||||
#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -63,6 +63,15 @@
|
|||
int vms_show = 0;
|
||||
#endif
|
||||
|
||||
#if defined(__AMIGA__)
|
||||
#if defined(__GNUC__)
|
||||
#define CURL_USED __attribute__((used))
|
||||
#else
|
||||
#define CURL_USED
|
||||
#endif
|
||||
static const char CURL_USED min_stack[] = "$STACK:16384";
|
||||
#endif
|
||||
|
||||
#ifdef __MINGW32__
|
||||
/*
|
||||
* There seems to be no way to escape "*" in command-line arguments with MinGW
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ static CURLcode post_per_transfer(struct GlobalConfig *global,
|
|||
outs->bytes);
|
||||
fflush(outs->stream);
|
||||
/* truncate file at the position where we started appending */
|
||||
#ifdef HAVE_FTRUNCATE
|
||||
#if defined(HAVE_FTRUNCATE) && !defined(__DJGPP__) && !defined(__AMIGA__)
|
||||
if(ftruncate(fileno(outs->stream), outs->init)) {
|
||||
/* when truncate fails, we cannot just append as then we will
|
||||
create something strange, bail out */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue