[pkgsrc/trunk]: pkgsrc/lang/gauche When including a builtin.mk file, you need...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43fca1673e7e
branches:  trunk
changeset: 539217:43fca1673e7e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Mar 02 00:55:15 2008 +0000

description:
When including a builtin.mk file, you need to guard it with CHECK_BUILTIN.*
settings so that the builtin.mk can be safely included by the buildlink3
framework later on.

diffstat:

 lang/gauche/Makefile |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 4cb1e844de22 -r 43fca1673e7e lang/gauche/Makefile
--- a/lang/gauche/Makefile      Sat Mar 01 23:33:09 2008 +0000
+++ b/lang/gauche/Makefile      Sun Mar 02 00:55:15 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2008/03/01 19:50:13 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2008/03/02 00:55:15 jlam Exp $
 #
 
 DISTNAME=      Gauche-0.8.13
@@ -18,16 +18,21 @@
 
 EVAL_PREFIX+=          SLIB_PREFIX=slib
 
+MAKE_JOBS_SAFE=                no
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-slib=${SLIB_PREFIX}/share/slib
 CONFIGURE_ARGS+=       --enable-threads=pthreads
 CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
+
+CHECK_BUILTIN.iconv:=  no
 .include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.iconv:=  yes
+
 .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"
+ALL_ENV+=              \
+       ICONV_LDFLAGS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib"
 .endif
-MAKE_JOBS_SAFE=                no
 
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gzip makeinfo