CVS commit: pkgsrc/converters/libiconv

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jul  8 11:04:36 UTC 2025

Modified Files:
        pkgsrc/converters/libiconv: Makefile

Log Message:
libiconv: Change SunOS iconv prototype.

With GCC 14 there is a huge amount of fallout with software that does not
support the const version of iconv().  Patching everything will be impossible,
so give up and switch to what everyone else is using by disabling the native
detection.  Still limited to SunOS, but in reality once GCC 14 hits then every
OS will need this if they default to const.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/converters/libiconv/Makefile

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/Makefile
diff -u pkgsrc/converters/libiconv/Makefile:1.69 pkgsrc/converters/libiconv/Makefile:1.70
--- pkgsrc/converters/libiconv/Makefile:1.69    Mon Jan 23 15:22:24 2023
+++ pkgsrc/converters/libiconv/Makefile Tue Jul  8 11:04:36 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2023/01/23 15:22:24 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2025/07/08 11:04:36 jperkin Exp $
 
 DISTNAME=      libiconv-1.17
+PKGREVISION=   1
 CATEGORIES=    converters
 MASTER_SITES=  ${MASTER_SITE_GNU:=libiconv/}
 
@@ -27,15 +28,12 @@ CONFIGURE_ARGS+=    --disable-nls
 
 CONFIGURE_ARGS+=       --htmldir=${PREFIX}/share/doc/libiconv
 
-# Explicitly override iconv checks, as GNU libiconv will change its own
-# signature based on whether it finds itself already installed somewhere
-# which then breaks software (e.g. QT) which assumes the native signature.
+# Disable detection of native iconv which can alter the signature for iconv(),
+# we want it to always default to the non-const arg1 for maximum compatibility.
 #
 # Restricted to SunOS for now, but likely will be useful everywhere.
 #
-CONFIGURE_ENV.SunOS+=  am_cv_func_iconv=yes
-CONFIGURE_ENV.SunOS+=  am_cv_proto_iconv_arg1='const'
-CONFIGURE_ENV.SunOS+=  am_cv_proto_iconv='extern size_t iconv (iconv_t cd, const char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);'
+CONFIGURE_ENV.SunOS+=  am_cv_func_iconv=no
 
 TEST_TARGET=           check