dev-lang/spidermonkey: make sed use in icu.m4 compatible with sed-4.3

Bug: http://bugs.gentoo.org/611232
Bug: http://bugs.gentoo.org/604696

Package-Manager: portage-2.3.3
This commit is contained in:
Ian Stakenvicius
2017-02-28 13:46:54 -05:00
parent 9c496ce7b0
commit 2f5896c744
2 changed files with 34 additions and 1 deletions

View File

@@ -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 @@
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 -z "${JS_STANDALONE}" -a -n "${JS_SHARED_LIBRARY}${MOZ_NATIVE_ICU}"; then
MOZ_SHARED_ICU=1
fi

View File

@@ -41,7 +41,8 @@ src_prepare() {
"${FILESDIR}"/mozjs38-1269317.patch \
"${FILESDIR}"/mozjs38-fix-tracelogger.patch \
"${FILESDIR}"/mozjs38-copy-headers.patch \
"${FILESDIR}"/mozjs38-pkg-config-version.patch
"${FILESDIR}"/mozjs38-pkg-config-version.patch \
"${FILESDIR}"/mozilla_configure_regexp_esr38.patch
eapply_user