summaryrefslogtreecommitdiff
path: root/lang/gauche
diff options
context:
space:
mode:
authortnn <tnn>2008-03-01 19:50:13 +0000
committertnn <tnn>2008-03-01 19:50:13 +0000
commit45d809597c8d3d68fa94832a0d851d6ef5f9189d (patch)
treebfa2d17b71ff22f8af719bc7f77ea0348dc191cc /lang/gauche
parent2717e949c3265cf08f3d97d8865619183100241d (diff)
downloadpkgsrc-45d809597c8d3d68fa94832a0d851d6ef5f9189d.tar.gz
Try to fix iconv breakage when USE_BUILTIN.iconv=no
Diffstat (limited to 'lang/gauche')
-rw-r--r--lang/gauche/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 50a86ab4743..02a189d158f 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/02/25 23:14:19 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2008/03/01 19:50:13 tnn Exp $
#
DISTNAME= Gauche-0.8.13
@@ -10,7 +10,7 @@ MAINTAINER= uebayasi@NetBSD.org, minoura@NetBSD.org
HOMEPAGE= http://www.shiro.dreamhost.com/scheme/gauche/index.html
COMMENT= R5RS Scheme implementation aimed to be a handy tool for daily works
-DEPENDS+= slib-[0-9]*:../../devel/slib
+DEPENDS+= slib-[0-9]*:../../devel/slib
PKG_DESTDIR_SUPPORT= user-destdir
@@ -18,16 +18,16 @@ PKG_DESTDIR_SUPPORT= user-destdir
EVAL_PREFIX+= SLIB_PREFIX=slib
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-slib=${SLIB_PREFIX}/share/slib
CONFIGURE_ARGS+= --enable-threads=pthreads
CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
-.include "../../converters/libiconv/buildlink3.mk"
-.if defined(BUILDLINK_LDADD.iconv) && !empty(BUILDLINK_LDADD.iconv:M-l*)
-CONFIGURE_ARGS+= --with-iconv-lib=${BUILDLINK_LDADD.iconv:M-l*:S/-l//:Q}
-MAKE_ENV+= ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+.include "../../converters/libiconv/builtin.mk"
+.if !empty(USE_BUILTIN.iconv:M[nN][oO])
+CONFIGURE_ARGS+= --with-iconv-lib=${BUILDLINK_LIBNAME.iconv}
+ALL_ENV+= ICONV_LDFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib"
.endif
-MAKE_JOBS_SAFE= no
+MAKE_JOBS_SAFE= no
USE_LIBTOOL= yes
USE_TOOLS+= gzip makeinfo
@@ -40,4 +40,5 @@ INFO_FILES= yes # PLIST
post-install:
gzip -d ${DESTDIR}${PREFIX}/${PKGINFODIR}/gauche-ref*gz
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"