diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-10-26 09:28:20 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-10-26 09:28:20 +0000 |
| commit | 1bff4f017a2ba0b5160657629b0d90c1b9365c27 (patch) | |
| tree | 0a228df3a6973d74aba5e93bec09568c14296fc4 /textproc/icu | |
| parent | 228a5853d569ccd0ce214e2adbc17f5ecad3a65d (diff) | |
| download | pkgsrc-1bff4f017a2ba0b5160657629b0d90c1b9365c27.tar.gz | |
Use the GCC build file when using SunOS/clang, and patch it to pass the -h
linker argument correctly.
Diffstat (limited to 'textproc/icu')
| -rw-r--r-- | textproc/icu/Makefile | 4 | ||||
| -rw-r--r-- | textproc/icu/distinfo | 3 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-config_mh-solaris-gcc | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 8f873f1ba50..356f31c1c53 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2015/10/09 23:15:34 ryoon Exp $ +# $NetBSD: Makefile,v 1.102 2015/10/26 09:28:20 jperkin Exp $ DISTNAME= icu4c-56_1-src PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --disable-threads # from ICU_CHECK_MH_FRAG in source/acinclude.m4 .if ${OPSYS} == "SunOS" -. if !empty(CC_VERSION:Mgcc*) +. if ${PKGSRC_COMPILER} == "clang" || ${PKGSRC_COMPILER} == "gcc" PLIST_SUBST+= MH_NAME=mh-solaris-gcc . else PLIST_SUBST+= MH_NAME=mh-solaris diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 5ed369b631a..15bcf6eaa66 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2015/10/09 23:15:34 ryoon Exp $ +$NetBSD: distinfo,v 1.57 2015/10/26 09:28:20 jperkin Exp $ SHA1 (icu4c-56_1-src.tgz) = e4494ce9425c469f138bb6e1ae06faf7fa0cf3de RMD160 (icu4c-56_1-src.tgz) = 1ef7f377283a379654ebb051b7439c2cc6151da0 @@ -16,6 +16,7 @@ SHA1 (patch-common_unicode_platform.h) = 8b7b8bcf6f5185225a1ca516ac212a495f7b47e SHA1 (patch-common_uposixdefs.h) = 02dedd10282961dec66673069796122b447dac33 SHA1 (patch-config_icu-config-bottom) = 168b89ee9180d4ae545125866ee91eb004010501 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472 +SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158 SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e diff --git a/textproc/icu/patches/patch-config_mh-solaris-gcc b/textproc/icu/patches/patch-config_mh-solaris-gcc new file mode 100644 index 00000000000..3b338a4589f --- /dev/null +++ b/textproc/icu/patches/patch-config_mh-solaris-gcc @@ -0,0 +1,15 @@ +$NetBSD: patch-config_mh-solaris-gcc,v 1.3 2015/10/26 09:28:20 jperkin Exp $ + +Pass -h correctly to linker for clang. + +--- config/mh-solaris-gcc.orig 2015-10-08 03:54:32.000000000 +0000 ++++ config/mh-solaris-gcc +@@ -23,7 +23,7 @@ LD_RPATH= -R'$$'ORIGIN + LD_RPATH_PRE= -R + + ## Compiler switch to embed a library name +-LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET)) ++LD_SONAME = -Wl,-h,$(notdir $(MIDDLE_SO_TARGET)) + + ## Shared library options + LD_SOOPTIONS= -Wl,-Bsymbolic |