Re: toolchains: branch master updated. c113b768e24439447e0306011ca2743606f227f9

On 09/05/17 23:13, NetSurf Browser Project (Commit Mailer) wrote:

> Gitweb links:
>
> ...log http://git.netsurf-browser.org/toolchains.git/shortlog/c113b768e24439447e0306011ca2743606f227f9
> ...commit http://git.netsurf-browser.org/toolchains.git/commit/c113b768e24439447e0306011ca2743606f227f9
> ...tree http://git.netsurf-browser.org/toolchains.git/tree/c113b768e24439447e0306011ca2743606f227f9
>
> The branch, master has been updated
> via c113b768e24439447e0306011ca2743606f227f9 (commit)
> from eb01b89e3e2cd6f74053b825cd1a31e07a60dd36 (commit)
>
> Those revisions listed above that are new to this repository have
> not appeared on any other notification email; so we list those
> revisions in full, below.
>
> - Log -----------------------------------------------------------------
> commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=c113b768e24439447e0306011ca2743606f227f9
> commit c113b768e24439447e0306011ca2743606f227f9
> Author: Chris Young <chris@unsatisfactorysoftware.co.uk>
> Commit: Chris Young <chris@unsatisfactorysoftware.co.uk>
>
> Set an OpenSSL environment path
> OpenSSL sometimes tries to read a config file which by default is in /opt. On AmigaOS this causes a request for volume opt:
> The way NetSurf uses curl/openssl doesn't appear to trigger this, but adding the option as a precaution as I've seen the problem with this OpenSSL build when used in other software.
>
> diff --git a/sdk/Makefile b/sdk/Makefile
> index 47efd13..629ddc8 100644
> --- a/sdk/Makefile
> +++ b/sdk/Makefile
> @@ -114,6 +114,7 @@ ifeq ($(TARGET),ppc-amigaos)
> SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg-turbo.d)
> EXTRAARGS_LIBCARES := --disable-shared
> EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver LIBS=-lpthread
> + EXTRAARGS_OPENSSL := --openssldir="/env/openssl"
> endif
>
> ifeq ($(TARGET),i686-w64-mingw32)
>

I'm afraid I've had to revert this change, as it breaks CI toolchain
builds[1]: --openssldir overrides --prefix, and so this change causes
the OpenSSL buildsystem to try to install into /env/openssl, rather than
{PREFIX}/ssl. /env does not exist, and thus this fails (and, even if it
did exist, and was writable, you'd still end up with a toolchain tarball
that didn't contain OpenSSL, and a build environment that no longer
worked, as OpenSSL headers and libraries would no longer be found).

If the problem this change is trying to solve is that, at runtime, in
the absence of an explicitly provided path to openssl.cnf, it will
default to looking in the computed openssldir (i.e. {prefix}/ssl), then
you're probably better off patching lines 83-86 of crypto/cryptlib.h to
ignore OPENSSLDIR on AmigaOS (as these macros are the only thing that
determines where OpenSSL looks for things by default).


J.

1. http://ci.netsurf-browser.org/jenkins/job/toolchain-ppc-amigaos/60/