1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/intl/icu-patches/bug-915735 Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,29 @@
1.4 +Bug 915735 - Fix linking the ICU libraries on Mac
1.5 +
1.6 +diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin
1.7 +index 97d6bfc..fe1490e 100644
1.8 +--- a/intl/icu/source/config/mh-darwin
1.9 ++++ b/intl/icu/source/config/mh-darwin
1.10 +@@ -23,21 +23,17 @@ ARFLAGS += -c
1.11 + COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c
1.12 + COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c
1.13 +
1.14 + ## Commands to make a shared library
1.15 + SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
1.16 + SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
1.17 +
1.18 + ## Compiler switches to embed a library name and version information
1.19 +-ifeq ($(ENABLE_RPATH),YES)
1.20 +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
1.21 +-else
1.22 +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
1.23 +-endif
1.24 ++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))
1.25 +
1.26 + ## Compiler switch to embed a runtime search path
1.27 + LD_RPATH=
1.28 + LD_RPATH_PRE= -Wl,-rpath,
1.29 +
1.30 + ## Environment variable to set a runtime search path
1.31 + LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH
1.32 +
