diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2017-02-28 14:48:25 -0500 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2017-02-28 15:41:58 -0500 |
| commit | 8fb65064d8753d73a0d03fb1ab53ff38bf86349b (patch) | |
| tree | 68c9750952b083436d6e22cb67272eb80bc300b7 /dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch | |
| parent | sci-mathematics/octave: Version bump to 4.2.1 (diff) | |
| download | gentoo-8fb65064d8753d73a0d03fb1ab53ff38bf86349b.tar.gz gentoo-8fb65064d8753d73a0d03fb1ab53ff38bf86349b.tar.bz2 gentoo-8fb65064d8753d73a0d03fb1ab53ff38bf86349b.zip | |
dev-lang/spidermonkey:45 - fix symlink installs via patch instead of sed
Found a patch to the build system which forces copies rather than symlinks
to all non-objfiles (meaning headers), to address the symlink installation
issue. Also applied the sed patch for icu.m4 for esr45
Package-Manager: portage-2.3.3
Diffstat (limited to 'dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch')
| -rw-r--r-- | dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch b/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch new file mode 100644 index 000000000000..9e165ff9e88e --- /dev/null +++ b/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr.patch @@ -0,0 +1,32 @@ +From: Jory A. Pratt <anarchy@gentoo.org> + +Note: the first occurrence of :space: is [:space:] (with a single pair +of []), where it should be [[:space:]] (with two pairs of []). + +This causes the sed command to fail (with the error message quoted in +my original report), driving to failure the whole configure step. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1329252 + +diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 +--- a/build/autoconf/icu.m4 ++++ b/build/autoconf/icu.m4 +@@ -68,17 +68,17 @@ if test -n "$USE_ICU"; then + icudir="$_topsrcdir/intl/icu/source" + if test ! -d "$icudir"; then + icudir="$_topsrcdir/../../intl/icu/source" + if test ! -d "$icudir"; then + AC_MSG_ERROR([Cannot find the ICU directory]) + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi + MOZ_ICU_VERSION="$version" + + if test "$OS_TARGET" = WINNT; then + MOZ_SHARED_ICU=1 + fi |