Bug 899722 Part 1: Fix ECMAScript intl on BSD by stripping the extra 's' added to the library name, as done on linux. r=norbert

This commit is contained in:
Landry Breuil 2013-08-14 13:03:40 +02:00
parent d228569c1e
commit 4826869196
3 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,29 @@
Bug 899722 Part 1: Fix ECMAScript intl on BSD by stripping the extra 's' added to the library name, as done on linux. r=norbert
diff --git a/intl/icu/source/config/mh-bsd-gcc b/intl/icu/source/config/mh-bsd-gcc
--- a/intl/icu/source/config/mh-bsd-gcc
+++ b/intl/icu/source/config/mh-bsd-gcc
@@ -58,10 +58,22 @@ STATIC_O = ao
## Versioned libraries rules
%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
$(RM) $@ && ln -s ${<F} $@
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
-## End FreeBSD-specific setup
+## Bind internal references
+# LDflags that pkgdata will use
+BIR_LDFLAGS= -Wl,-Bsymbolic
+
+# Dependencies [i.e. map files] for the final library
+BIR_DEPS=
+
+## Remove shared library 's'
+STATIC_PREFIX_WHEN_USED =
+STATIC_PREFIX =
+
+## End BSD-specific setup
+

View File

@ -63,5 +63,17 @@ STATIC_O = ao
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
## End FreeBSD-specific setup
## Bind internal references
# LDflags that pkgdata will use
BIR_LDFLAGS= -Wl,-Bsymbolic
# Dependencies [i.e. map files] for the final library
BIR_DEPS=
## Remove shared library 's'
STATIC_PREFIX_WHEN_USED =
STATIC_PREFIX =
## End BSD-specific setup

View File

@ -40,5 +40,6 @@ svn info $1 > ${icu_dir}/SVN-INFO
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-724533
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-853706
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722
hg addremove ${icu_dir}