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
authorLandry Breuil <landry@openbsd.org>
Wed, 14 Aug 2013 13:03:40 +0200
changeset 142521 93c54132c3cbc6d72156e8c2adc033f5a09b07be
parent 142520 9d3fa47e4dcbb8574df60bcc428e5402e5f56228
child 142522 02017a95970f98893f146c8c09cb2c4fe41aeed6
push id32439
push userlandry@openbsd.org
push dateWed, 14 Aug 2013 11:05:39 +0000
treeherdermozilla-inbound@65822b58fa9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnorbert
bugs899722
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
intl/icu-patches/bug-899722
intl/icu/source/config/mh-bsd-gcc
intl/update-icu.sh
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/bug-899722
@@ -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
++
--- 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
+
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -35,10 +35,11 @@ rm ${icu_dir}/source/data/region/*.mk
 rm ${icu_dir}/source/data/region/*.txt
 rm ${icu_dir}/source/data/translit/*
 
 # Record `svn info`
 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}