| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From a46adb74b5ba5e17d676d31d70faca76c1381d15 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 12 Jul 2018 21:25:46 +0800 |
| 4 | Subject: [PATCH 4/5] do not use autoconf 2.13 to refresh old.configure |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe specific] |
| 7 | |
| 8 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 9 | --- |
| 10 | build/moz.configure/old.configure | 2 +- |
| 11 | js/src/old-configure | 2 +- |
| 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure |
| 15 | index ece47f4..a73900f 100644 |
| 16 | --- a/build/moz.configure/old.configure |
| 17 | +++ b/build/moz.configure/old.configure |
| 18 | @@ -83,7 +83,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, |
| 19 | old_configure = os.path.join(old_configure_dir, 'js', 'src', |
| 20 | os.path.basename(old_configure)) |
| 21 | |
| 22 | - refresh = True |
| 23 | + refresh = False |
| 24 | if exists(old_configure): |
| 25 | mtime = getmtime(old_configure) |
| 26 | aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', |
| 27 | diff --git a/js/src/old-configure b/js/src/old-configure |
| 28 | index 75b00e1..8a8ef52 100644 |
| 29 | --- a/js/src/old-configure |
| 30 | +++ b/js/src/old-configure |
| 31 | @@ -619,7 +619,7 @@ if test -z "$srcdir"; then |
| 32 | ac_prog=$0 |
| 33 | ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` |
| 34 | test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. |
| 35 | - srcdir=$ac_confdir |
| 36 | + srcdir="$ac_confdir/../../" |
| 37 | if test ! -r $srcdir/$ac_unique_file; then |
| 38 | srcdir=.. |
| 39 | fi |
| 40 | -- |
| 41 | 2.7.4 |
| 42 | |