Fix build errors for spidermonkey and erlang 18.3
diff --git a/ansible/debian-9-erlang-18.3.yml b/ansible/debian-9-erlang-18.3.yml
index 3d83d92..fee0bea 100644
--- a/ansible/debian-9-erlang-18.3.yml
+++ b/ansible/debian-9-erlang-18.3.yml
@@ -17,8 +17,8 @@
- hosts: couchdb-ci-worker
vars:
- erlang_solutions_pkg_ver: "1:18.3-1"
+ erlang_solutions_pkg_ver: "1:18.3.4.5"
remote_user: root
roles:
- debian-9
- - erlang-esl-debian-pkgs
+ - erlang-esl-debian-omnibus
diff --git a/ansible/roles/spidermonkey/files/fix-811665.patch b/ansible/roles/spidermonkey/files/fix-811665.patch
new file mode 100644
index 0000000..a3e06d8
--- /dev/null
+++ b/ansible/roles/spidermonkey/files/fix-811665.patch
@@ -0,0 +1,153 @@
+Description: Fix FTBFS with gcc6
+ Most fixes are returning NULL instead of false and a narrowing issues.
+Author: Tobias Frost <tobi@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811665
+Last-Update: 2016-09-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/js/src/ctypes/CTypes.cpp
++++ b/js/src/ctypes/CTypes.cpp
+@@ -4753,7 +4753,7 @@ NewFunctionInfo(JSContext* cx,
+ for (JSUint32 i = 0; i < argLength; ++i) {
+ bool isEllipsis;
+ if (!IsEllipsis(cx, argTypes[i], &isEllipsis))
+- return false;
++ return NULL;
+ if (isEllipsis) {
+ fninfo->mIsVariadic = true;
+ if (i < 1) {
+--- a/js/src/jsapi.cpp
++++ b/js/src/jsapi.cpp
+@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
+ AutoIdVector props(cx);
+ JSIdArray *ida;
+ if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
+- return false;
++ return NULL;
+ for (size_t n = 0; n < size_t(ida->length); ++n)
+ JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
+ return ida;
+--- a/js/src/jsfun.cpp
++++ b/js/src/jsfun.cpp
+@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
+
+ JSString *str = JS_DecompileFunction(cx, fun, indent);
+ if (!str)
+- return false;
++ return NULL;
+
+ if (!indent)
+ cx->compartment->toSourceCache.put(fun, str);
+@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
+ const Shape *shape = funobj->nativeLookup(id);
+ if (!shape) {
+ if (!ResolveInterpretedFunctionPrototype(cx, funobj))
+- return false;
++ return NULL;
+ shape = funobj->nativeLookup(id);
+ }
+ JS_ASSERT(!shape->configurable());
+--- a/js/src/jsiter.cpp
++++ b/js/src/jsiter.cpp
+@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
+ */
+ JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
+ if (!obj)
+- return false;
++ return NULL;
+ obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
+ obj->setMap(cx->compartment->emptyEnumeratorShape);
+ return obj;
+--- a/js/src/jsparse.cpp
++++ b/js/src/jsparse.cpp
+@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
+ if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
+ JS_ASSERT(pn->pn_cookie.isFree());
+ if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
+- return false;
++ return NULL;
+ }
+
+ pn->pn_blockid = outertc->blockid();
+--- a/js/src/jsstr.cpp
++++ b/js/src/jsstr.cpp
+@@ -1734,7 +1734,7 @@ class RegExpGuard
+ if (flat) {
+ patstr = flattenPattern(cx, fm.patstr);
+ if (!patstr)
+- return false;
++ return NULL;
+ } else {
+ patstr = fm.patstr;
+ }
+@@ -3408,7 +3408,7 @@ js_InitStringClass(JSContext *cx, JSObje
+ UndefinedValue(), NULL, NULL,
+ JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
+ NULL)) {
+- return JS_FALSE;
++ return NULL;
+ }
+
+ return proto;
+--- a/js/src/jstypedarray.cpp
++++ b/js/src/jstypedarray.cpp
+@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
+ if (size != 0 && count >= INT32_MAX / size) {
+ JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+ JSMSG_NEED_DIET, "size and count");
+- return false;
++ return NULL;
+ }
+
+ int32 bytelen = size * count;
+@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
+
+ default:
+ JS_NOT_REACHED("shouldn't have gotten here");
+- return false;
++ return NULL;
+ }
+ }
+
+--- a/js/src/jsxml.cpp
++++ b/js/src/jsxml.cpp
+@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
+
+ obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
+ if (!obj)
+- return JS_FALSE;
++ return NULL;
+ JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
+ JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
+ JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
+@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
+ size_t length = str->length();
+ jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
+ if (!chars)
+- return JS_FALSE;
++ return NULL;
+ *chars = '@';
+ const jschar *strChars = str->getChars(cx);
+ if (!strChars) {
+--- a/js/src/methodjit/InvokeHelpers.cpp
++++ b/js/src/methodjit/InvokeHelpers.cpp
+@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
+ {
+ JSStackFrame *fp = cx->fp();
+ if (fp->hasImacropc())
+- return false;
++ return NULL;
+
+ JSScript *script = fp->script();
+ return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
+--- a/js/src/nanojit/NativeX64.cpp
++++ b/js/src/nanojit/NativeX64.cpp
+@@ -1899,7 +1899,7 @@ namespace nanojit
+ }
+ }
+
+- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
++ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {(int64_t) 0x8000000000000000ULL,0};
+
+ void Assembler::asm_fneg(LIns *ins) {
+ Register rr, ra;
diff --git a/ansible/roles/spidermonkey/tasks/main.yml b/ansible/roles/spidermonkey/tasks/main.yml
index 34ed1e1..d6d42b0 100644
--- a/ansible/roles/spidermonkey/tasks/main.yml
+++ b/ansible/roles/spidermonkey/tasks/main.yml
@@ -19,19 +19,30 @@
get_url:
url: "http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz"
dest: /tmp/js185-1.0.0.tar.gz
+
- name: unpack Spidermonkey 1.8.5
unarchive:
src: /tmp/js185-1.0.0.tar.gz
dest: /opt
copy: no
+
+- name: patch source for debian9 build
+ patch:
+ src: "{{ role_path }}/files/fix-811665.patch"
+ basedir: /opt/js-1.8.5/
+ strip: 1
+ when: ansible_distribution == "Debian"
+
- name: configure Spidermonkey 1.8.5
command: ./configure --prefix=/usr --with-system-nspr --disable-tests --disable-strip --enable-ctypes --enable-threadsafe --disable-methodjit
args:
chdir: /opt/js-1.8.5/js/src
+
- name: make Spidermonkey 1.8.5
command: make
args:
chdir: /opt/js-1.8.5/js/src
+
- name: make install Spidermonkey 1.8.5
command: make install
args:
