diff options
| author | dsainty <dsainty@pkgsrc.org> | 2012-08-20 04:56:00 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2012-08-20 04:56:00 +0000 |
| commit | 10bc5de96ffd3aa924eb1a185a65ba2599c80bab (patch) | |
| tree | 6f90a5f7b4eb6d278b9f7dfca5a0566338e3a105 | |
| parent | df0a0b70de7444ab4cd20b57a8665ac63a560229 (diff) | |
| download | pkgsrc-10bc5de96ffd3aa924eb1a185a65ba2599c80bab.tar.gz | |
Rather than assuming SunOS == libiconv, use ICONV_TYPE in the usual manner
to correctly express what variety of iconv we are using.
Fixes build on Linux systems with PREFER_PKGSRC=yes.
| -rw-r--r-- | devel/pkg-config/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 71f16631dfc..faf67fd4292 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2012/08/18 14:40:12 tron Exp $ +# $NetBSD: Makefile,v 1.24 2012/08/20 04:56:00 dsainty Exp $ DISTNAME= pkg-config-0.27 PKGREVISION= 1 @@ -39,10 +39,12 @@ post-configure: .endif .if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --with-libiconv=gnu CONFIGURE_ARGS+= --disable-dtrace .endif +CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} +CONFIGURE_ARGS.gnu-iconv= --with-libiconv=gnu + PKGCONFIG_EXTRA_PATHS= # empty .if ${LOCALBASE} != ${X11BASE} |