CVS commit: pkgsrc/converters/libiconv

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Jan 13 17:35:05 UTC 2020

Modified Files:
        pkgsrc/converters/libiconv: builtin.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/converters/libiconv/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/libiconv/builtin.mk
diff -u pkgsrc/converters/libiconv/builtin.mk:1.24 pkgsrc/converters/libiconv/builtin.mk:1.25
--- pkgsrc/converters/libiconv/builtin.mk:1.24  Sun Nov  3 17:14:25 2019
+++ pkgsrc/converters/libiconv/builtin.mk       Mon Jan 13 17:35:05 2020
@@ -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