| 1 |
commit: 77165b807efc2a976f20c98dd6e07c24aa349656 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 3 15:16:40 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 3 15:17:11 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77165b80 |
| 7 |
|
| 8 |
dev-libs/icu: add Prefix support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-libs/icu/Manifest | 4 +-- |
| 13 |
dev-libs/icu/files/icu-58.2-darwin.patch | 55 ++++++++++++++++++++++++++++++++ |
| 14 |
dev-libs/icu/icu-58.2-r1.ebuild | 15 ++++++++- |
| 15 |
dev-libs/icu/icu-60.1.ebuild | 9 +++++- |
| 16 |
4 files changed, 79 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest |
| 19 |
index 25e55a75ffb..2fb7f8b34c1 100644 |
| 20 |
--- a/dev-libs/icu/Manifest |
| 21 |
+++ b/dev-libs/icu/Manifest |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-DIST icu4c-58_1-src.tgz 23366443 SHA256 0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 WHIRLPOOL faf2624a83f0d6f874166b328522dc9c89088db2690433ab05e96371722b635b81fd5210c7e87fe8e5df6681e881cf10204832925b448552affe8c2f6c851e37 |
| 24 |
-DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a |
| 25 |
+DIST icu4c-58_1-src.tgz 23366443 BLAKE2B 16f1c778d925893769c6e0f0901fe02e57289535a25edd8ee8c96bdf4551499ead2c75d0f7e733fb89d1670c5065f1e8013ebe14cbdc34881a67452e622cd990 SHA512 59b2a76834192a35125fda326587e613ef4486152cf0278c6f22568d4ae02c4b2d897efcea2654ef2b11bd1c3154aecd38cb68a70f69430736f343689f94c155 |
| 26 |
+DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a |
| 27 |
DIST icu4c-59_1-src.tgz 22706578 SHA256 7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe SHA512 9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4 WHIRLPOOL f213951e98b7e1b59a3caf193f671fd9dff9a77c49aa3c4c118d6e3414688830ffb029d5c01495b369d4e666ab38669340a4c24a26f93742a99145972e20ede0 |
| 28 |
DIST icu4c-60_1-src.tgz 23296064 BLAKE2B 4f90c1f4f00b686d2632429fbaa6a6ec3d977e414f8d00cf82a525a1504c9d8c9b1a19458b495e5847abbcfff933038752f96d6bd165d206582f8ec1b77fff40 SHA512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233 |
| 29 |
|
| 30 |
diff --git a/dev-libs/icu/files/icu-58.2-darwin.patch b/dev-libs/icu/files/icu-58.2-darwin.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..e5a9000a346 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-libs/icu/files/icu-58.2-darwin.patch |
| 35 |
@@ -0,0 +1,55 @@ |
| 36 |
+same as 4.7, but retargetted to apply with eapply |
| 37 |
+ |
| 38 |
+--- a/config/mh-darwin |
| 39 |
++++ b/config/mh-darwin |
| 40 |
+@@ -4,6 +4,13 @@ |
| 41 |
+ ## Copyright (c) 1999-2011 International Business Machines Corporation and |
| 42 |
+ ## others. All Rights Reserved. |
| 43 |
+ |
| 44 |
++ |
| 45 |
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) |
| 46 |
++FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO) |
| 47 |
++MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO) |
| 48 |
++ |
| 49 |
++IS_DARWIN = yes |
| 50 |
++ |
| 51 |
+ ## Flags for position independent code |
| 52 |
+ SHAREDLIBCFLAGS = -dynamic |
| 53 |
+ SHAREDLIBCXXFLAGS = -dynamic |
| 54 |
+@@ -28,7 +35,7 @@ |
| 55 |
+ ifeq ($(ENABLE_RPATH),YES) |
| 56 |
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
| 57 |
+ else |
| 58 |
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) |
| 59 |
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) |
| 60 |
+ endif |
| 61 |
+ |
| 62 |
+ ## Compiler switch to embed a runtime search path |
| 63 |
+--- a/stubdata/Makefile.in |
| 64 |
++++ b/stubdata/Makefile.in |
| 65 |
+@@ -32,7 +32,11 @@ |
| 66 |
+ |
| 67 |
+ |
| 68 |
+ ifneq ($(ENABLE_SHARED),) |
| 69 |
++ifeq ($(IS_DARWIN),) |
| 70 |
+ SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) |
| 71 |
++else |
| 72 |
++SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO) |
| 73 |
++endif |
| 74 |
+ ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT) |
| 75 |
+ endif |
| 76 |
+ |
| 77 |
+--- a/tools/ctestfw/Makefile.in |
| 78 |
++++ b/tools/ctestfw/Makefile.in |
| 79 |
+@@ -31,7 +31,11 @@ |
| 80 |
+ endif |
| 81 |
+ |
| 82 |
+ ifneq ($(ENABLE_SHARED),) |
| 83 |
++ifeq ($(IS_DARWIN),) |
| 84 |
+ SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) |
| 85 |
++else |
| 86 |
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) |
| 87 |
++endif |
| 88 |
+ ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT) |
| 89 |
+ endif |
| 90 |
+ |
| 91 |
|
| 92 |
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild |
| 93 |
index 1eaa578e41b..cb2f808c5fc 100644 |
| 94 |
--- a/dev-libs/icu/icu-58.2-r1.ebuild |
| 95 |
+++ b/dev-libs/icu/icu-58.2-r1.ebuild |
| 96 |
@@ -13,7 +13,7 @@ LICENSE="BSD" |
| 97 |
|
| 98 |
SLOT="0/${PV}" |
| 99 |
|
| 100 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" |
| 101 |
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 102 |
IUSE="debug doc examples static-libs" |
| 103 |
|
| 104 |
DEPEND=" |
| 105 |
@@ -34,6 +34,7 @@ PATCHES=( |
| 106 |
"${FILESDIR}/${PN}-58.1-iterator.patch" |
| 107 |
"${FILESDIR}/${PN}-58.2-CVE-2017-7867.patch" |
| 108 |
"${FILESDIR}/${PN}-58.2-glibc226.patch" |
| 109 |
+ "${FILESDIR}/${PN}-58.2-darwin.patch" |
| 110 |
) |
| 111 |
|
| 112 |
pkg_pretend() { |
| 113 |
@@ -66,6 +67,12 @@ src_prepare() { |
| 114 |
-e 's:icudefs.mk:icudefs.mk Doxyfile:' \ |
| 115 |
configure.ac || die |
| 116 |
|
| 117 |
+ # Fix compilation on Solaris due to enabling of conflicting standards |
| 118 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 119 |
+ sed -i -e '/define _XOPEN_SOURCE_EXTENDED/s/_XOPEN/no_XOPEN/' \ |
| 120 |
+ common/uposixdefs.h || die |
| 121 |
+ fi |
| 122 |
+ |
| 123 |
eautoreconf |
| 124 |
} |
| 125 |
|
| 126 |
@@ -116,6 +123,12 @@ multilib_src_configure() { |
| 127 |
# icu tries to use clang by default |
| 128 |
tc-export CC CXX |
| 129 |
|
| 130 |
+ # make sure we configure with the same shell as we run icu-config |
| 131 |
+ # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined |
| 132 |
+ export CONFIG_SHELL=${EPREFIX}/bin/sh |
| 133 |
+ # probably have no /bin/sh in prefix-chain |
| 134 |
+ [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH} |
| 135 |
+ |
| 136 |
ECONF_SOURCE=${S} \ |
| 137 |
econf "${myeconfargs[@]}" |
| 138 |
} |
| 139 |
|
| 140 |
diff --git a/dev-libs/icu/icu-60.1.ebuild b/dev-libs/icu/icu-60.1.ebuild |
| 141 |
index c8f9ddca172..773d5b35d4b 100644 |
| 142 |
--- a/dev-libs/icu/icu-60.1.ebuild |
| 143 |
+++ b/dev-libs/icu/icu-60.1.ebuild |
| 144 |
@@ -13,7 +13,7 @@ LICENSE="BSD" |
| 145 |
|
| 146 |
SLOT="0/${PV}" |
| 147 |
|
| 148 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
| 149 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
| 150 |
IUSE="debug doc examples static-libs" |
| 151 |
|
| 152 |
DEPEND=" |
| 153 |
@@ -31,6 +31,7 @@ MULTILIB_CHOST_TOOLS=( |
| 154 |
|
| 155 |
PATCHES=( |
| 156 |
"${FILESDIR}/${PN}-58.1-remove-bashisms.patch" |
| 157 |
+ "${FILESDIR}/${PN}-58.2-darwin.patch" |
| 158 |
) |
| 159 |
|
| 160 |
pkg_pretend() { |
| 161 |
@@ -113,6 +114,12 @@ multilib_src_configure() { |
| 162 |
# icu tries to use clang by default |
| 163 |
tc-export CC CXX |
| 164 |
|
| 165 |
+ # make sure we configure with the same shell as we run icu-config |
| 166 |
+ # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined |
| 167 |
+ export CONFIG_SHELL=${EPREFIX}/bin/sh |
| 168 |
+ # probably have no /bin/sh in prefix-chain |
| 169 |
+ [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL=${BASH} |
| 170 |
+ |
| 171 |
ECONF_SOURCE=${S} \ |
| 172 |
econf "${myeconfargs[@]}" |
| 173 |
} |
Archives