Sat Sep 22 04:43:09 2012 UTC ()
Fix `Fix build on SunOS`.

Passing LIBS=-liconv will be result in unwanted libiconv linkage for libdatrie
(it is just required for trietool-0.2),
then it cause build failure of depending packages due to missing libiconv.

Passing sufficient iconv library to configure script with right way,
and it also fix build failure on other platforms for the case GNU iconv
from pkgsrc is preferred rather than builtin iconv.


(obache)
diff -r1.9 -r1.10 pkgsrc/devel/libdatrie/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/devel/libdatrie/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libdatrie/Makefile 2012/02/16 18:46:51 1.9
+++ pkgsrc/devel/libdatrie/Makefile 2012/09/22 04:43:09 1.10
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.9 2012/02/16 18:46:51 hans Exp $ 1# $NetBSD: Makefile,v 1.10 2012/09/22 04:43:09 obache Exp $
2# 2#
3 3
4DISTNAME= libdatrie-0.2.5 4DISTNAME= libdatrie-0.2.5
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \ 6MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/ \
7 ftp://linux.thai.net/pub/ThaiLinux/software/libthai/ 7 ftp://linux.thai.net/pub/ThaiLinux/software/libthai/
8 8
9MAINTAINER= obache@NetBSD.org 9MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://linux.thai.net/~thep/datrie/datrie.html 10HOMEPAGE= http://linux.thai.net/~thep/datrie/datrie.html
11COMMENT= Implementation of Double-Array Trie 11COMMENT= Implementation of Double-Array Trie
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19 19
20LIBS.SunOS+= -liconv 20CONFIGURE_ENV+= ICONV_LIBS=${BUILDLINK_LDADD.iconv:Q}
21 21
22PKGCONFIG_OVERRIDE+= datrie-0.2.pc.in 22PKGCONFIG_OVERRIDE+= datrie-0.2.pc.in
23 23
24CONFIGURE_ARGS+= --disable-doxygen-doc 24CONFIGURE_ARGS+= --disable-doxygen-doc
25 25
26.include "../../converters/libiconv/buildlink3.mk" 26.include "../../converters/libiconv/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"