diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2020-01-16 14:15:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 14:15:09 -0500 |
| commit | 355803ea11799cc18f69fd48346184a2625e172a (patch) | |
| tree | 5a596a621a31383864f8b926eda527ed819854f9 | |
| parent | d7188ba8dea81739e8535b92ede1c6613bb598f8 (diff) | |
| download | couchdb-355803ea11799cc18f69fd48346184a2625e172a.tar.gz | |
Explicitly disallow SM60 on aarch64
Includes configure changes and Jenkins setting change.
| -rw-r--r-- | INSTALL.Unix.md | 5 | ||||
| -rw-r--r-- | build-aux/Jenkinsfile.full | 2 | ||||
| -rwxr-xr-x | configure | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md index f0baf58c9..1934e9be9 100644 --- a/INSTALL.Unix.md +++ b/INSTALL.Unix.md @@ -39,7 +39,10 @@ You should have the following installed: * Erlang OTP (>=R16B03-1, =<19.x) (http://erlang.org/) * ICU (http://icu-project.org/) * OpenSSL (http://www.openssl.org/) - * Mozilla SpiderMonkey (1.8.5) (https://developer.mozilla.org/en/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5) + * Mozilla SpiderMonkey - either 1.8.5 or 60 + * 60 is not supported on ARM 64-bit (aarch64) at this time. + * https://developer.mozilla.org/en/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5 + * https://archive.mozilla.org/pub/firefox/releases/60.9.0esr/source/ (src/js) * GNU Make (http://www.gnu.org/software/make/) * GNU Compiler Collection (http://gcc.gnu.org/) * libcurl (http://curl.haxx.se/libcurl/) diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full index c9327f800..f13be068d 100644 --- a/build-aux/Jenkinsfile.full +++ b/build-aux/Jenkinsfile.full @@ -478,7 +478,7 @@ pipeline { } environment { platform = 'buster' - sm_ver = '60' + sm_ver = '1.8.5' } stages { stage('Build from tarball & test') { @@ -31,6 +31,7 @@ SKIP_DEPS=0 COUCHDB_USER="$(whoami 2>/dev/null || echo couchdb)" SM_VSN="1.8.5" +ARCH="$(uname -m)" . ${rootdir}/version.mk COUCHDB_VERSION=${vsn_major}.${vsn_minor}.${vsn_patch} @@ -177,6 +178,12 @@ parse_opts() { parse_opts $@ +if [ "${ARCH}" = "aarch64" ] && [ "${SM_VSN}" != "1.8.5" ] +then + echo "ERROR: SpiderMonkey 60 is known broken on ARM 64 (aarch64). Use 1.8.5 instead." + exit 1 +fi + echo "==> configuring couchdb in rel/couchdb.config" cat > rel/couchdb.config << EOF % Licensed under the Apache License, Version 2.0 (the "License"); you may not |