Followup for bug 1264129 - Give the executable bit to configure. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 13 Apr 2016 10:41:37 +0900
changeset 292931 b68333205a825f55ce9f4cfae2b7465869993ae0
parent 292930 fb5f7f7e9c5c72b63708e4a44dd3c337b56d47c3
child 292932 f43c0ea2c7c847ca361375164b3a4c58eb714426
push id75032
push usermh@glandium.org
push dateWed, 13 Apr 2016 01:44:24 +0000
treeherdermozilla-inbound@b68333205a82 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1264129
milestone48.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
Followup for bug 1264129 - Give the executable bit to configure. r=me Also touch old-configure.in and js/src/old-configure.in to force configure and js/src/configure to be updated.
client.mk
js/src/old-configure.in
old-configure.in
--- a/client.mk
+++ b/client.mk
@@ -303,16 +303,17 @@ EXTRA_CONFIG_DEPS := \
   $(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
   $(TOPSRCDIR)/js/src/aclocal.m4 \
   $(TOPSRCDIR)/js/src/old-configure.in \
   $(NULL)
 
 $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
 	@echo Generating $@
 	sed '1,/^divert/d' $< > $@
+	chmod +x $@
 
 CONFIG_STATUS_DEPS := \
   $(wildcard $(TOPSRCDIR)/*/confvars.sh) \
   $(CONFIGURES) \
   $(TOPSRCDIR)/CLOBBER \
   $(TOPSRCDIR)/nsprpub/configure \
   $(TOPSRCDIR)/config/milestone.txt \
   $(TOPSRCDIR)/browser/config/version.txt \
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1,17 +1,16 @@
 dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
 dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4:
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Process this file with autoconf to produce a configure script.
 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:
--- a/old-configure.in
+++ b/old-configure.in
@@ -1,17 +1,16 @@
 dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*-
 dnl vi: set tabstop=4 shiftwidth=4 expandtab syntax=m4:
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Process this file with autoconf to produce a configure script.
 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: