diff options
| author | adam <adam@pkgsrc.org> | 2019-04-24 07:59:36 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2019-04-24 07:59:36 +0000 |
| commit | 9aa492dbe108f47a7ac2ef4c10a219a3cf18d16a (patch) | |
| tree | 5fba3360fd55d5bbc2a7c8c28bcefac9ad964683 | |
| parent | 067e5e6193ba2c6aeef6c46ae384c71a380bc2a2 (diff) | |
| download | pkgsrc-9aa492dbe108f47a7ac2ef4c10a219a3cf18d16a.tar.gz | |
icu: restore -install_name fix for Darwin
| -rw-r--r-- | textproc/icu/distinfo | 3 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-config_mh-darwin | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 9e543a3fa54..d61ae57a0d4 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.84 2019/04/23 13:32:11 ryoon Exp $ +$NetBSD: distinfo,v 1.85 2019/04/24 07:59:36 adam Exp $ SHA1 (icu4c-64_2-src.tgz) = 3127155ecf2b75ab4835f501b7478e39c07bb852 RMD160 (icu4c-64_2-src.tgz) = 23e00d87c106aa079c48701c0b8a823ef2c79202 @@ -14,6 +14,7 @@ SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e SHA1 (patch-common_uposixdefs.h) = 4739ca7d4662335adcb322cd0943770651d548ce SHA1 (patch-config_Makefile.inc.in) = e7cee161315321d2580074054d87714b55319886 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 +SHA1 (patch-config_mh-darwin) = 4fd2c664b23078692b61557ebb66693712d333cd SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 SHA1 (patch-configure) = 1f96ffb2c2c023b38a45326c0273be0ae9cc02ff SHA1 (patch-configure.ac) = 2cb4601e20ee6b93e08e8790df3f8212510aeb1b diff --git a/textproc/icu/patches/patch-config_mh-darwin b/textproc/icu/patches/patch-config_mh-darwin new file mode 100644 index 00000000000..4a7095b23d2 --- /dev/null +++ b/textproc/icu/patches/patch-config_mh-darwin @@ -0,0 +1,18 @@ +$NetBSD: patch-config_mh-darwin,v 1.3 2019/04/24 07:59:36 adam Exp $ + +On Darwin, -install_name must be a full path. + +--- config/mh-darwin.orig 2019-04-24 07:37:10.000000000 +0000 ++++ config/mh-darwin +@@ -30,11 +30,7 @@ SHLIB.c= $(CC) -dynamiclib -dynamic $(CF + 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)) $(PKGDATA_TRAILING_SPACE) +-endif + + ## Compiler switch to embed a runtime search path + LD_RPATH= |