From: Viktor Szakats Date: Tue, 18 Oct 2022 18:22:41 +0000 (+0000) Subject: amiga: do not hardcode openssl/zlib into the os config [ci skip] X-Git-Tag: curl-7_86_0~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05d23823d7ab7e29f333a58fc50709e9856b3487;p=thirdparty%2Fcurl.git amiga: do not hardcode openssl/zlib into the os config [ci skip] Enable them in `lib/makefile.amiga` and `src/makefile.amiga` instead. This allows builds without openssl and/or zlib. E.g. with the cross-compiler. Reviewed-by: Daniel Stenberg Closes #9762 --- diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index ca2f7fd1c8..14f3a0448b 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -36,7 +36,6 @@ #define HAVE_INTTYPES_H 1 #define HAVE_IOCTLSOCKET_CAMEL 1 #define HAVE_IOCTLSOCKET_CAMEL_FIONBIO 1 -#define HAVE_LIBZ 1 #define HAVE_LONGLONG 1 #define HAVE_NETDB_H 1 #define HAVE_NETINET_IN_H 1 @@ -73,7 +72,6 @@ #define SIZEOF_SIZE_T 4 #define USE_MANUAL 1 -#define USE_OPENSSL 1 #define CURL_DISABLE_LDAP 1 #define OS "AmigaOS" diff --git a/lib/makefile.amiga b/lib/makefile.amiga index b09fee9086..d5c8fe615e 100644 --- a/lib/makefile.amiga +++ b/lib/makefile.amiga @@ -31,7 +31,7 @@ ATCPSDKI= /GG/netinclude CC = m68k-amigaos-gcc -CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall +CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall -DUSE_OPENSSL -DHAVE_LIBZ include Makefile.inc OBJS = $(CSOURCES:.c=.o) diff --git a/src/makefile.amiga b/src/makefile.amiga index 70ad277e01..9aac7a0fb8 100644 --- a/src/makefile.amiga +++ b/src/makefile.amiga @@ -31,7 +31,7 @@ ATCPSDKI= /GG/netinclude CC = m68k-amigaos-gcc -CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall +CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall -DUSE_OPENSSL -DHAVE_LIBZ LIBS = ../lib/libcurl.a -lssl -lcrypto -lz MANPAGE = ../docs/curl.1 README = ../docs/MANUAL