Bug 1520730 - Normalize the config log path before writing it in old-configure. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 17 Jan 2019 13:54:41 +0000
changeset 454278 d08b5d16f36f9918c396adb05a105d07697e4e78
parent 454277 69acbdb013fe5cebeccce619478475621feceafe
child 454279 0a28f41635eb8f186ebbe27fff2a15626162d08d
push id35392
push userncsoregi@mozilla.com
push dateThu, 17 Jan 2019 21:53:28 +0000
treeherdermozilla-central@24982570fc83 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1520730
milestone66.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 1520730 - Normalize the config log path before writing it in old-configure. r=froydnj Add a dummy change to old-configure.in so that old-configure is force-refreshed. Differential Revision: https://phabricator.services.mozilla.com/D16797
build/moz.configure/old.configure
js/src/old-configure.in
old-configure.in
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -135,17 +135,17 @@ def prepare_configure(old_configure, moz
             die('Generated old-configure is empty! Check that your autoconf 2.13 program works!')
 
         # Make old-configure append to config.log, where we put our own log.
         # This could be done with a m4 macro, but it's way easier this way
         if config_log:
             path = config_log.baseFilename
         else:
             path = '/dev/null'
-        script = script.replace('>./config.log', '>>%s' % path)
+        script = script.replace('>./config.log', '>>%s' % quote(normsep(path)))
 
         with open(old_configure, 'wb') as fh:
             fh.write(script)
 
     cmd = [shell, old_configure]
     with encoded_open('old-configure.vars', 'w') as out:
         log.debug('Injecting the following to old-configure:')
 
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -8,17 +8,17 @@ dnl Process this file with autoconf to p
 dnl ========================================================
 AC_PREREQ(2.13)
 AC_INIT(js/src/jsapi.h)
 AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
 AC_CANONICAL_SYSTEM
 
 dnl ========================================================
 dnl =
-dnl = Don't change the following two lines.  Doing so breaks:
+dnl = Don't change the following lines.  Doing so breaks:
 dnl =
 dnl = CFLAGS="-foo" ./configure
 dnl =
 dnl ========================================================
 CFLAGS="${CFLAGS=}"
 CPPFLAGS="${CPPFLAGS=}"
 CXXFLAGS="${CXXFLAGS=}"
 LDFLAGS="${LDFLAGS=}"
--- a/old-configure.in
+++ b/old-configure.in
@@ -8,17 +8,17 @@ dnl Process this file with autoconf to p
 dnl ========================================================
 AC_PREREQ(2.13)
 AC_INIT(config/config.mk)
 AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
 AC_CANONICAL_SYSTEM
 
 dnl ========================================================
 dnl =
-dnl = Don't change the following two lines.  Doing so breaks:
+dnl = Don't change the following lines.  Doing so breaks:
 dnl =
 dnl = CFLAGS="-foo" ./configure
 dnl =
 dnl ========================================================
 CFLAGS="${CFLAGS=}"
 CPPFLAGS="${CPPFLAGS=}"
 CXXFLAGS="${CXXFLAGS=}"
 LDFLAGS="${LDFLAGS=}"