diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2024-01-04 12:56:13 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2024-01-04 12:56:13 +0000 |
| commit | cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b (patch) | |
| tree | 705b399e05c6f8ca18ce7b67cf4ad9aaf5c6f829 /sdk | |
| parent | 012d2a970fb610d89a753b5369fe5ba1ddbd2a01 (diff) | |
| download | toolchains-cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b.tar.gz toolchains-cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b.tar.bz2 | |
m68k-unknown-amigaos: Switch libcurl to AmiSSL v5
libcurl+OpenSSL+NetSurf doesn't connect to secure sites under OS3.x.
Confirmed libcurl+AmiSSL (v5.13)+NetSurf, along with Miami,
is a working combination under AmigaOS 3.2.2.1
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index e1083ed..6cb1aa5 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -214,18 +214,16 @@ ifeq ($(TARGET),m68k-unknown-amigaos) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) EXTRAARGS_LIBCARES := --disable-shared --without-random LIBCARES_ENV := LIBS="-lm" - # XXX: reinstate amissl when there's v5 sdk? - #LIBCURL_SSL := amissl + LIBCURL_SSL := amissl EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-zlib --disable-rt --disable-ipv6 LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024 -DRLIMIT_NOFILE=6" LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" - # XXX: build openssl against bsdsocket.library? - #ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" + ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" ifeq ($(LIBCURL_SSL),openssl) LIBCURL_ENV := LIBS="-lm -lnet" else - LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" + LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API -DHAVE_IOCTLSOCKET_CAMEL_FIONBIO" LIBS="-lm" endif # XXX: libgcc is meant to be implied, but for some reason that # results in ld evaluating it after libm and thus failing to find symbols. |