From 0aa65b1139553f5db53c1f1d19c9a377e64bb9ca Mon Sep 17 00:00:00 2001 From: Jeff Walden Date: Fri, 12 Jun 2015 14:25:23 -0700 Subject: [PATCH] Bug 1075758 - Apply the local patch for bug 915735 (it works without needing any updating). r=glandium --- intl/icu/source/config/mh-darwin | 6 +----- intl/update-icu.sh | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin index 97d6bfc2d66..fe1490e9a51 100644 --- a/intl/icu/source/config/mh-darwin +++ b/intl/icu/source/config/mh-darwin @@ -28,11 +28,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) ## Compiler switches to embed a library name and version information -ifeq ($(ENABLE_RPATH),YES) -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) -else -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) -endif +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET)) ## Compiler switch to embed a runtime search path LD_RPATH= diff --git a/intl/update-icu.sh b/intl/update-icu.sh index 90fed762040..3ab8b25e66a 100755 --- a/intl/update-icu.sh +++ b/intl/update-icu.sh @@ -50,9 +50,10 @@ rm ${icu_dir}/source/data/translit/* # the tree.) svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO +patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735 + exit 0 -patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/genrb-omitCollationRules.diff patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/qualify-uinitonce-windows.diff patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff