intl/icu-patches/bug-915735@97036ab72558 (annotated)
intl/icu-patches/bug-915735
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | Bug 915735 - Fix linking the ICU libraries on Mac |
| michael@0 | 2 | |
| michael@0 | 3 | diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin |
| michael@0 | 4 | index 97d6bfc..fe1490e 100644 |
| michael@0 | 5 | --- a/intl/icu/source/config/mh-darwin |
| michael@0 | 6 | +++ b/intl/icu/source/config/mh-darwin |
| michael@0 | 7 | @@ -23,21 +23,17 @@ ARFLAGS += -c |
| michael@0 | 8 | COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c |
| michael@0 | 9 | COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c |
| michael@0 | 10 | |
| michael@0 | 11 | ## Commands to make a shared library |
| michael@0 | 12 | SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) |
| michael@0 | 13 | SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) |
| michael@0 | 14 | |
| michael@0 | 15 | ## Compiler switches to embed a library name and version information |
| michael@0 | 16 | -ifeq ($(ENABLE_RPATH),YES) |
| michael@0 | 17 | -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
| michael@0 | 18 | -else |
| michael@0 | 19 | -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) |
| michael@0 | 20 | -endif |
| michael@0 | 21 | +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)) |
| michael@0 | 22 | |
| michael@0 | 23 | ## Compiler switch to embed a runtime search path |
| michael@0 | 24 | LD_RPATH= |
| michael@0 | 25 | LD_RPATH_PRE= -Wl,-rpath, |
| michael@0 | 26 | |
| michael@0 | 27 | ## Environment variable to set a runtime search path |
| michael@0 | 28 | LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH |
| michael@0 | 29 |
