| 1 |
commit: 2f5896c74447204c4e28e1d54a057b8961a601e0 |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 18:46:54 2017 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 18:49:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5896c7 |
| 7 |
|
| 8 |
dev-lang/spidermonkey: make sed use in icu.m4 compatible with sed-4.3 |
| 9 |
|
| 10 |
Bug: http://bugs.gentoo.org/611232 |
| 11 |
Bug: http://bugs.gentoo.org/604696 |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.3 |
| 14 |
|
| 15 |
.../files/mozilla_configure_regexp_esr38.patch | 32 ++++++++++++++++++++++ |
| 16 |
.../spidermonkey/spidermonkey-38.2.1_rc0.ebuild | 3 +- |
| 17 |
2 files changed, 34 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr38.patch b/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr38.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000000..488b02f128 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-lang/spidermonkey/files/mozilla_configure_regexp_esr38.patch |
| 24 |
@@ -0,0 +1,32 @@ |
| 25 |
+From: Jory A. Pratt <anarchy@g.o> |
| 26 |
+ |
| 27 |
+Note: the first occurrence of :space: is [:space:] (with a single pair |
| 28 |
+of []), where it should be [[:space:]] (with two pairs of []). |
| 29 |
+ |
| 30 |
+This causes the sed command to fail (with the error message quoted in |
| 31 |
+my original report), driving to failure the whole configure step. |
| 32 |
+ |
| 33 |
+https://bugzilla.mozilla.org/show_bug.cgi?id=1329252 |
| 34 |
+ |
| 35 |
+diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 |
| 36 |
+--- a/build/autoconf/icu.m4 |
| 37 |
++++ b/build/autoconf/icu.m4 |
| 38 |
+@@ -68,17 +68,17 @@ |
| 39 |
+ icudir="$_topsrcdir/intl/icu/source" |
| 40 |
+ if test ! -d "$icudir"; then |
| 41 |
+ icudir="$_topsrcdir/../../intl/icu/source" |
| 42 |
+ if test ! -d "$icudir"; then |
| 43 |
+ AC_MSG_ERROR([Cannot find the ICU directory]) |
| 44 |
+ fi |
| 45 |
+ fi |
| 46 |
+ |
| 47 |
+- 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"` |
| 48 |
++ 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"` |
| 49 |
+ if test x"$version" = x; then |
| 50 |
+ AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) |
| 51 |
+ fi |
| 52 |
+ MOZ_ICU_VERSION="$version" |
| 53 |
+ |
| 54 |
+ if test -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then |
| 55 |
+ MOZ_SHARED_ICU=1 |
| 56 |
+ fi |
| 57 |
|
| 58 |
diff --git a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild |
| 59 |
index ad154d68f8..f03e6d13be 100644 |
| 60 |
--- a/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild |
| 61 |
+++ b/dev-lang/spidermonkey/spidermonkey-38.2.1_rc0.ebuild |
| 62 |
@@ -41,7 +41,8 @@ src_prepare() { |
| 63 |
"${FILESDIR}"/mozjs38-1269317.patch \ |
| 64 |
"${FILESDIR}"/mozjs38-fix-tracelogger.patch \ |
| 65 |
"${FILESDIR}"/mozjs38-copy-headers.patch \ |
| 66 |
- "${FILESDIR}"/mozjs38-pkg-config-version.patch |
| 67 |
+ "${FILESDIR}"/mozjs38-pkg-config-version.patch \ |
| 68 |
+ "${FILESDIR}"/mozilla_configure_regexp_esr38.patch |
| 69 |
|
| 70 |
eapply_user |
Archives