pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/libiconv converters/libiconv: allow to skip...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2578275d28a8
branches:  trunk
changeset: 408933:2578275d28a8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jan 13 17:35:05 2020 +0000

description:
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:

 converters/libiconv/builtin.mk |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r fa354b2bfcf4 -r 2578275d28a8 converters/libiconv/builtin.mk
--- a/converters/libiconv/builtin.mk    Mon Jan 13 16:53:01 2020 +0000
+++ b/converters/libiconv/builtin.mk    Mon Jan 13 17:35:05 2020 +0000
@@ -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 @@
 .    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



Home | Main Index | Thread Index | Old Index