summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-01-13 17:35:05 +0000
committerrillig <rillig@pkgsrc.org>2020-01-13 17:35:05 +0000
commite8c139ecb7a418acef480b9de738e463d531fef5 (patch)
treefe261f27fe6a371e1de78a2ea72c74efbcc82a88 /converters
parentc4e6ca103c9d34efd3979f7a54027ae2a8051c81 (diff)
downloadpkgsrc-e8c139ecb7a418acef480b9de738e463d531fef5.tar.gz
converters/libiconv: allow to skip --with-libiconv-prefix
There are several GNU configure scripts that don't support this option. These packages can be found by setting GNU_CONFIGURE_STRICT=yes in mk.conf. To allow these packages to build nevertheless, packages have to skip this option explicitly, for backwards compatibility.
Diffstat (limited to 'converters')
-rw-r--r--converters/libiconv/builtin.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/converters/libiconv/builtin.mk b/converters/libiconv/builtin.mk
index 28988c94c5f..b32fd54eb66 100644
--- a/converters/libiconv/builtin.mk
+++ b/converters/libiconv/builtin.mk
@@ -1,4 +1,13 @@
-# $NetBSD: builtin.mk,v 1.24 2019/11/03 17:14:25 rillig Exp $
+# $NetBSD: builtin.mk,v 1.25 2020/01/13 17:35:05 rillig Exp $
+#
+# Package-settable variables:
+#
+# GNU_CONFIGURE_ICONV: YesNo
+# Whether to add --with-libiconv-prefix to CONFIGURE_ARGS.
+#
+# Default: yes
+#
+# Keywords: iconv
BUILTIN_PKG:= iconv
@@ -157,7 +166,7 @@ BUILDLINK_TRANSFORM+= rm:-liconv
. endif
. endif
-. if defined(GNU_CONFIGURE)
+. if defined(GNU_CONFIGURE) && ${GNU_CONFIGURE_ICONV:Uyes:M[yY][eE][sS]}
. if !empty(USE_BUILTIN.iconv:M[nN][oO])
CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
. endif