Bug 1426553 - Autoconf-related changes to spidermonkey jobs. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 21 Dec 2017 09:41:19 +0900
changeset 449034 62aa4a2039b99cc7919fdbc594ce7785faf1015b
parent 449033 81b25e99112c8bcb319b3a92890529ac9646f704
child 449035 f28babf65d7277182a3ab72825e1a16641c0fee5
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1426553
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1426553 - Autoconf-related changes to spidermonkey jobs. r=nalexander On Debian, the autoconf binary is autoconf2.13 while it is autoconf-2.13 on Centos. In make-source-package.sh, we need to run autoconf to generate the old-configure to include in the package, so try both. In hazard-analysis.sh, we actually don't need autoconf itself, so just copy configure.in to configure.
js/src/make-source-package.sh
taskcluster/scripts/builder/hazard-analysis.sh
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -2,17 +2,17 @@
 
 # Find out ASAP if some command breaks here, because we're copying a lot of
 # files we don't actually maintain ourselves, and requirements could easily be
 # broken.
 set -e
 
 : ${MKDIR:=mkdir}
 : ${TAR:=tar}
-: ${AUTOCONF:=autoconf-2.13}
+: ${AUTOCONF:=$(which autoconf-2.13 autoconf2.13 | head -1)}
 : ${SRCDIR:=$(cd $(dirname $0); pwd 2>/dev/null)}
 : ${MOZJS_NAME:=mozjs}
 # The place to gather files to be added to the tarball.
 : ${STAGING:=/tmp/mozjs-src-pkg}
 # The place to put the resulting tarball.
 : ${DIST:=/tmp}
 
 if [[ -f "$SRCDIR/../../config/milestone.txt" ]]; then
--- a/taskcluster/scripts/builder/hazard-analysis.sh
+++ b/taskcluster/scripts/builder/hazard-analysis.sh
@@ -34,17 +34,18 @@ fi
 function build_js_shell () {
     # Must unset MOZ_OBJDIR and MOZCONFIG here to prevent the build system from
     # inferring that the analysis output directory is the current objdir. We
     # need a separate objdir here to build the opt JS shell to use to run the
     # analysis.
     (
     unset MOZ_OBJDIR
     unset MOZCONFIG
-    ( cd $JS_SRCDIR; autoconf-2.13 )
+    cp -P $JS_SRCDIR/configure.in $JS_SRCDIR/configure
+    chmod +x $JS_SRCDIR/configure
     if [[ -z "$HAZ_DEP" ]]; then
         [ -d $HAZARD_SHELL_OBJDIR ] && rm -rf $HAZARD_SHELL_OBJDIR
     fi
     mkdir -p $HAZARD_SHELL_OBJDIR || true
     cd $HAZARD_SHELL_OBJDIR
     $JS_SRCDIR/configure --enable-optimize --disable-debug --enable-ctypes --enable-nspr-build --without-intl-api --with-ccache
     make -j4
     ) # Restore MOZ_OBJDIR and MOZCONFIG