diff -Naur icu.orig/Portfile icu/Portfile
old
|
new
|
|
79 | 79 | checksums rmd160 b1440e1a3330b12336742c881863a8de6a6d2235 \ |
80 | 80 | sha256 d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 |
81 | 81 | |
82 | | patchfiles patch-config-mh-darwin.diff |
| 82 | patchfiles patch-config-mh-darwin.diff \ |
| 83 | patch-tools-toolutil-pkg_genc.c |
83 | 84 | |
84 | 85 | # icu appends -O2 to the cflags and cxxflags |
85 | 86 | configure.optflags-delete -Os |
diff -Naur icu.orig/files/patch-config-mh-darwin.diff icu/files/patch-config-mh-darwin.diff
old
|
new
|
|
1 | | --- config/mh-darwin.orig 2012-09-10 19:00:37.000000000 -0500 |
2 | | +++ config/mh-darwin 2014-08-13 17:12:02.000000000 -0500 |
| 1 | --- config/mh-darwin.orig 2014-10-03 18:11:56.000000000 +0200 |
| 2 | +++ config/mh-darwin 2014-12-17 15:41:00.000000000 +0100 |
3 | 3 | @@ -28,11 +28,7 @@ |
4 | 4 | SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) |
5 | 5 | |
6 | 6 | ## Compiler switches to embed a library name and version information |
7 | 7 | -ifeq ($(ENABLE_RPATH),YES) |
8 | | LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
| 8 | -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
9 | 9 | -else |
10 | 10 | -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) |
11 | 11 | -endif |
| 12 | +LD_SONAME = -Wl,-dylib_compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-dylib_current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
12 | 13 | |
13 | 14 | ## Compiler switch to embed a runtime search path |
14 | 15 | LD_RPATH= |
diff -Naur icu.orig/files/patch-tools-toolutil-pkg_genc.c icu/files/patch-tools-toolutil-pkg_genc.c
old
|
new
|
|
| 1 | --- tools/toolutil/pkg_genc.c.orig 2014-10-03 18:11:34.000000000 +0200 |
| 2 | +++ tools/toolutil/pkg_genc.c 2014-12-17 17:22:02.000000000 +0100 |
| 3 | @@ -131,7 +131,7 @@ |
| 4 | ".globl _%s\n" |
| 5 | "\t.data\n" |
| 6 | "\t.const\n" |
| 7 | - "\t.balign 16\n" |
| 8 | + "\t.align 4\n" |
| 9 | "_%s:\n\n", |
| 10 | |
| 11 | ".long ","",HEX_0X |