diff options
| author | tron <tron@pkgsrc.org> | 2013-10-05 11:08:24 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2013-10-05 11:08:24 +0000 |
| commit | ff4556695a129c6b2a7a91b1594fa0343836e9eb (patch) | |
| tree | bf1aa090647b1ef47afe3c813e6fb9f39b8db8c9 /textproc | |
| parent | 4998df338c6d34382ebd431e800187e28ee77ab1 (diff) | |
| download | pkgsrc-ff4556695a129c6b2a7a91b1594fa0343836e9eb.tar.gz | |
Make sure that the target directory for shared libraries is always defined.
This fixes one of the build problems under NetBSD and Mac OS X introduced
by the Cygwin patches.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/icu/distinfo | 4 | ||||
| -rw-r--r-- | textproc/icu/patches/patch-ad | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/textproc/icu/distinfo b/textproc/icu/distinfo index 5c643eed8ae..7f67ed0447f 100644 --- a/textproc/icu/distinfo +++ b/textproc/icu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2013/10/04 18:26:29 joerg Exp $ +$NetBSD: distinfo,v 1.37 2013/10/05 11:08:24 tron Exp $ SHA1 (icu4c-51_2-src.tgz) = 074a28dfc96d37ce72c831f3e3e2d686f1f76a14 RMD160 (icu4c-51_2-src.tgz) = ef1256bb87b3dcec1cf40b32b11c5c3f1bd48af6 @@ -6,7 +6,7 @@ Size (icu4c-51_2-src.tgz) = 21841928 bytes SHA1 (patch-aa) = fcbebb03f4a48294faeebd600fee989cab351230 SHA1 (patch-ab) = 32f0e4c241535e37e4cad9b871ed3d36b4184199 SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 -SHA1 (patch-ad) = 75e57734ad508140e87513b37ade4b295821696e +SHA1 (patch-ad) = 024dcc26c96a4c9de88890f2e2a093b2d08014a0 SHA1 (patch-af) = b6314fb4f807b64e1b37f67d2aefe86e30707842 SHA1 (patch-common_Makefile.in) = 20fa472bd0e5e5fac15153774a58a8ce034d1996 SHA1 (patch-common_putilimp.h) = ff97ae0b8fd96ec8296e5164c135610a1a358810 diff --git a/textproc/icu/patches/patch-ad b/textproc/icu/patches/patch-ad index c8ded01d7c4..c9cb1c735b6 100644 --- a/textproc/icu/patches/patch-ad +++ b/textproc/icu/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.11 2012/11/07 20:59:51 adam Exp $ +$NetBSD: patch-ad,v 1.12 2013/10/05 11:08:24 tron Exp $ ---- icudefs.mk.in.orig 2010-12-07 12:14:06.000000000 +0000 -+++ icudefs.mk.in -@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX) +--- icudefs.mk.in.orig 2013-05-23 21:06:32.000000000 +0100 ++++ icudefs.mk.in 2013-10-05 12:01:05.000000000 +0100 +@@ -207,13 +207,13 @@ ## If we can't use the shared libraries, use the static libraries ifneq ($(ENABLE_SHARED),YES) @@ -18,3 +18,13 @@ $NetBSD: patch-ad,v 1.11 2012/11/07 20:59:51 adam Exp $ LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) A = a SOBJ = $(SO) +@@ -306,5 +306,9 @@ + cross_buildroot = $(top_builddir) + endif + ++ifeq ($(DSO_LIBDIR),) ++DSO_LIBDIR= $(DESTDIR)$(libdir) ++endif ++ + # optional include at top + -include $(top_builddir)/icudefs.local |