diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/gauche/Makefile | 6 | ||||
-rw-r--r-- | lang/gauche/options.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index fb376d37b65..10d1db86b3a 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2014/08/28 17:45:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.66 2014/12/03 14:00:57 joerg Exp $ # DISTNAME= Gauche-0.9.4 @@ -31,8 +31,10 @@ CHECK_BUILTIN.iconv:= no .if !empty(USE_BUILTIN.iconv:M[nN][oO]) CONFIGURE_ARGS+= --with-iconv-lib=${BUILDLINK_LIBNAME.iconv} +ICONV_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib \ + -L${BUILDLINK_PREFIX.iconv}/lib ALL_ENV+= \ - ICONV_LDFLAGS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib" + ICONV_LDFLAGS=${ICONV_LDFLAGS:Q} .endif USE_LANGUAGES= c c99 diff --git a/lang/gauche/options.mk b/lang/gauche/options.mk index d4d7b40ad92..d137364129c 100644 --- a/lang/gauche/options.mk +++ b/lang/gauche/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:02 jlam Exp $ +# $NetBSD: options.mk,v 1.8 2014/12/03 14:00:57 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gauche PKG_OPTIONS_OPTIONAL_GROUPS= multibyte @@ -20,7 +20,9 @@ PLIST_VARS+= gdbm .if !empty(PKG_OPTIONS:Mgdbm) . include "../../databases/gdbm/buildlink3.mk" PLIST.gdbm= yes -MAKE_ENV+= GDBM_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gdbm}/lib +GDBM_LDFLAGS= -L${BUILDLINK_PREFIX.gdbm}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gdbm}/lib +MAKE_ENV+= GDBM_LDFLAGS=${GDBM_LDFLAGS:Q} .endif ### |