iconv_open: Remove support for IRIX.

* m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN): Remove code for IRIX.
* lib/iconv_open.c (ICONV_FLAVOR_IRIX): Remove macro.
* lib/iconv_open-irix.gperf: Remove file.
* modules/iconv_open (Files): Remove it.
(Makefile.am): Remove rule for $(srcdir)/iconv_open-irix.h. Update
BUILT_SOURCES, MOSTLYCLEANFILES, MAINTAINERCLEANFILES, EXTRA_DIST
accordingly.

diff --git a/ChangeLog b/ChangeLog
index 4c47faf1ed21c076e670490debad2180305913d0..bdac14fbfa433dbe41026ae0ae1bf54ffde9389b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+       iconv_open: Remove support for IRIX.
+       * m4/iconv_open.m4 (gl_FUNC_ICONV_OPEN): Remove code for IRIX.
+       * lib/iconv_open.c (ICONV_FLAVOR_IRIX): Remove macro.
+       * lib/iconv_open-irix.gperf: Remove file.
+       * modules/iconv_open (Files): Remove it.
+       (Makefile.am): Remove rule for $(srcdir)/iconv_open-irix.h. Update
+       BUILT_SOURCES, MOSTLYCLEANFILES, MAINTAINERCLEANFILES, EXTRA_DIST
+       accordingly.
+
        Remove support for IRIX regarding sigaltstack.
        * m4/sigaltstack.m4 (SV_SIGALTSTACK): Assume that ss_sp is the start
        address, not the end address, of the alternate stack area.

diff --git a/lib/iconv_open-irix.gperf b/lib/iconv_open-irix.gperf
deleted file mode 100644 (file)
index 39d7ea8..0000000
--- a/lib/iconv_open-irix.gperf
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Character set conversion.
-   Copyright (C) 2007, 2020-2025 Free Software Foundation, Inc.
-
-   This file is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   This file is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-
-struct mapping { int standard_name; const char vendor_name[10 + 1]; };
-%struct-type
-%language=ANSI-C
-%define slot-name standard_name
-%define hash-function-name mapping_hash
-%define lookup-function-name mapping_lookup
-%readonly-tables
-%global-table
-%define word-array-name mappings
-%pic
-%%
-# On IRIX 6.5, look in /usr/lib/iconv and /usr/lib/international/encodings.
-ISO-8859-1, "ISO8859-1"
-ISO-8859-2, "ISO8859-2"
-ISO-8859-3, "ISO8859-3"
-ISO-8859-4, "ISO8859-4"
-ISO-8859-5, "ISO8859-5"
-ISO-8859-6, "ISO8859-6"
-ISO-8859-7, "ISO8859-7"
-ISO-8859-8, "ISO8859-8"
-ISO-8859-9, "ISO8859-9"
-ISO-8859-15, "ISO8859-15"
-KOI8-R, "KOI8"
-CP855, "DOS855"
-CP1251, "WIN1251"
-GB2312, "eucCN"
-EUC-JP, "eucJP"
-EUC-KR, "eucKR"
-EUC-TW, "eucTW"
-SHIFT_JIS, "sjis"
-TIS-620, "TIS620"

diff --git a/lib/iconv_open.c b/lib/iconv_open.c
index e7ad73c9ea423ad9023be8fef4cd92c20370e849..544edbe3f9d00bf146ae90635157e23ce8a75646 100644 (file)
--- a/lib/iconv_open.c
+++ b/lib/iconv_open.c
@@ -33,7 +33,6 @@
 
 #define ICONV_FLAVOR_AIX "iconv_open-aix.h"
 #define ICONV_FLAVOR_HPUX "iconv_open-hpux.h"
-#define ICONV_FLAVOR_IRIX "iconv_open-irix.h"
 #define ICONV_FLAVOR_SOLARIS "iconv_open-solaris.h"
 #define ICONV_FLAVOR_ZOS "iconv_open-zos.h"
 

diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index ccd010bf200c13109ade026ba94cb9edf44c9c87..3fe509f259acdd85b5ec21b439f59ac7dc1a6ad0 100644 (file)
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4
-# serial 18
+# serial 19
 dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -27,7 +27,6 @@ AC_DEFUN([gl_FUNC_ICONV_OPEN],
       iconv_flavor=
       case "$host_os" in
         aix*)         iconv_flavor=ICONV_FLAVOR_AIX ;;
-        irix*)        iconv_flavor=ICONV_FLAVOR_IRIX ;;
         hpux*)        iconv_flavor=ICONV_FLAVOR_HPUX ;;
         solaris*)     iconv_flavor=ICONV_FLAVOR_SOLARIS ;;
         openedition*) iconv_flavor=ICONV_FLAVOR_ZOS ;;

diff --git a/modules/iconv_open b/modules/iconv_open
index fd10e01b0a156c2b59fa2d8a0a9cec9110812ecf..2ac5252a1caa139e158d9695c0b1b46bfd4e1474 100644 (file)
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -5,7 +5,6 @@ Files:
 lib/iconv_open.c
 lib/iconv_open-aix.gperf
 lib/iconv_open-hpux.gperf
-lib/iconv_open-irix.gperf
 lib/iconv_open-solaris.gperf
 lib/iconv_open-zos.gperf
 lib/iconv.c
@@ -49,12 +48,6 @@ $(srcdir)/iconv_open-hpux.h: $(srcdir)/iconv_open-hpux.gperf
               < $(srcdir)/iconv_open-hpux.h-t1 > $(srcdir)/iconv_open-hpux.h-t2 \
        && rm -f $(srcdir)/iconv_open-hpux.h-t1 \
        && mv $(srcdir)/iconv_open-hpux.h-t2 $(srcdir)/iconv_open-hpux.h
-$(srcdir)/iconv_open-irix.h: $(srcdir)/iconv_open-irix.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t1 \
-       && sed -e 's|\([ "]\)[^ "]*/iconv_open-irix\.gperf\([ "]\)|\1iconv_open-irix.gperf\2|' \
-              < $(srcdir)/iconv_open-irix.h-t1 > $(srcdir)/iconv_open-irix.h-t2 \
-       && rm -f $(srcdir)/iconv_open-irix.h-t1 \
-       && mv $(srcdir)/iconv_open-irix.h-t2 $(srcdir)/iconv_open-irix.h
 $(srcdir)/iconv_open-solaris.h: $(srcdir)/iconv_open-solaris.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t1 \
        && sed -e 's|\([ "]\)[^ "]*/iconv_open-solaris\.gperf\([ "]\)|\1iconv_open-solaris.gperf\2|' \
@@ -67,14 +60,13 @@ $(srcdir)/iconv_open-zos.h: $(srcdir)/iconv_open-zos.gperf
               < $(srcdir)/iconv_open-zos.h-t1 > $(srcdir)/iconv_open-zos.h-t2 \
        && rm -f $(srcdir)/iconv_open-zos.h-t1 \
        && mv $(srcdir)/iconv_open-zos.h-t2 $(srcdir)/iconv_open-zos.h
-BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-solaris.h iconv_open-zos.h
+BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-solaris.h iconv_open-zos.h
 MOSTLYCLEANFILES     += iconv_open-aix.h-t1 iconv_open-aix.h-t2 \
                         iconv_open-hpux.h-t1 iconv_open-hpux.h-t2 \
-                        iconv_open-irix.h-t1 iconv_open-irix.h-t2 \
                         iconv_open-solaris.h-t1 iconv_open-solaris.h-t2 \
                         iconv_open-zos.h-t1 iconv_open-zos.h-t2
-MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-solaris.h iconv_open-zos.h
-EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-solaris.h iconv_open-zos.h
+MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-solaris.h iconv_open-zos.h
+EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-solaris.h iconv_open-zos.h
 
 Include:
 #if HAVE_ICONV