diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-07-17 09:31:44 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-07-16 18:42:40 -0700 |
commit | 50e8ed5fd4d09be1e89fb7fd0ba6b26c8be15699 (patch) | |
tree | 355eb7bc6cce190180b8cef5245ebcc7b73b81e5 /meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch | |
parent | 2de6f8d1b4608dbdce391c3d89d01402eb641f52 (diff) | |
download | meta-openembedded-contrib-50e8ed5fd4d09be1e89fb7fd0ba6b26c8be15699.tar.gz |
mozjs: 17.0.0 -> 52.8.1
- Refactor recipe 52.8.1
0001 ~ 0006
- Rebase patches to 52.8.1;
0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
0010-fix-cross-compilation-on-i586-targets.patch'
- Drop 0001-regenerate-configure.patch and everything works well
- Drop Manually_mmap_heap_memory_esr17.patch which is backported
- Drop obsolete patches
0001-compare-the-first-character-of-string-to-be-null-or-.patch
0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch
0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
0004-mozbug746112-no-decommit-on-large-pages.patch
0005-aarch64-64k-page.patch
fix_milestone_compile_issue.patch
fix-the-compile-error-of-powerpc64.patch
Update-Double-Conversion.patch and Update-the-double-conversion-update-script.patch
- Set DISABLE_STATIC = "" to build without option `--disable-static'
- Set musl patch (0006-support-musl.patch) with musl override.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch')
-rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch b/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch new file mode 100644 index 0000000000..4cba79c5ba --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0004-do-not-use-autoconf-2.13-to-refresh-old.configure.patch @@ -0,0 +1,42 @@ +From a46adb74b5ba5e17d676d31d70faca76c1381d15 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Thu, 12 Jul 2018 21:25:46 +0800 +Subject: [PATCH 4/5] do not use autoconf 2.13 to refresh old.configure + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + build/moz.configure/old.configure | 2 +- + js/src/old-configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure +index ece47f4..a73900f 100644 +--- a/build/moz.configure/old.configure ++++ b/build/moz.configure/old.configure +@@ -83,7 +83,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell, + old_configure = os.path.join(old_configure_dir, 'js', 'src', + os.path.basename(old_configure)) + +- refresh = True ++ refresh = False + if exists(old_configure): + mtime = getmtime(old_configure) + aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf', +diff --git a/js/src/old-configure b/js/src/old-configure +index 75b00e1..8a8ef52 100644 +--- a/js/src/old-configure ++++ b/js/src/old-configure +@@ -619,7 +619,7 @@ if test -z "$srcdir"; then + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. +- srcdir=$ac_confdir ++ srcdir="$ac_confdir/../../" + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +-- +2.7.4 + |