0001-allow-newer-autoconf-versions.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. From 646a78262b18e19721cd41ee515215221dd241b6 Mon Sep 17 00:00:00 2001
  2. From: Hongxu Jia <hongxu.jia@windriver.com>
  3. Date: Thu, 12 Jul 2018 18:12:42 +0800
  4. Subject: [PATCH] allow newer autoconf versions
  5. Spidermonkey is hardcoded to use Autoconf 2.13, which is from 1999!
  6. The reasoning behind using 2.13 is because newer versions of Autoconf at the
  7. time did not work correctly with the custom m4 macros in the source code.
  8. However: Because we are building just the spidermonkey engine instead of the
  9. entire firefox package, and we are using a tarball with a pre-setup
  10. old-configure file, there is no need for the old version of autoconf.
  11. See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642
  12. Upstream-Status: Inappropriate [embedded specific]
  13. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  14. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  15. ---
  16. build/moz.configure/old.configure | 4 ++--
  17. js/src/old-configure | 2 +-
  18. 2 files changed, 3 insertions(+), 3 deletions(-)
  19. diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
  20. index 17d0c5bf..436fcc5e 100644
  21. --- a/build/moz.configure/old.configure
  22. +++ b/build/moz.configure/old.configure
  23. @@ -33,7 +33,7 @@ def autoconf(mozconfig, autoconf):
  24. autoconf = autoconf[0] if autoconf else None
  25. for ac in (mozconfig_autoconf, autoconf, 'autoconf-2.13', 'autoconf2.13',
  26. - 'autoconf213'):
  27. + 'autoconf213', 'autoconf'):
  28. if ac:
  29. autoconf = find_program(ac)
  30. if autoconf:
  31. @@ -87,7 +87,7 @@ def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell,
  32. old_configure = os.path.join(old_configure_dir, 'js', 'src',
  33. os.path.basename(old_configure))
  34. - refresh = True
  35. + refresh = False
  36. if exists(old_configure):
  37. mtime = getmtime(old_configure)
  38. aclocal = os.path.join(build_env.topsrcdir, 'build', 'autoconf',
  39. diff --git a/js/src/old-configure b/js/src/old-configure
  40. index 58cc646f..ebd2646e 100644
  41. --- a/js/src/old-configure
  42. +++ b/js/src/old-configure
  43. @@ -587,7 +587,7 @@ if test -z "$srcdir"; then
  44. ac_prog=$0
  45. ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
  46. test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
  47. - srcdir=$ac_confdir
  48. + srcdir="$ac_confdir/../../"
  49. if test ! -r $srcdir/$ac_unique_file; then
  50. srcdir=..
  51. fi
  52. --
  53. 2.23.0