[PATCH 5/5] iconvdata: Split out non-essential gconv module configuration

[DJ Delorie]

Siddhesh Poyarekar via Libc-alpha <libc-alpha@sourceware.org> writes:
> Split module configuration so that only the bare minimum charsets,

Confirmed it's just a split, no modifications.

> diff --git a/iconvdata/Makefile b/iconvdata/Makefile
> index 8925a684eb..3c6929fb59 100644
> --- a/iconvdata/Makefile
> +++ b/iconvdata/Makefile
> @@ -137,7 +137,7 @@ charmaps = ../localedata/charmaps
>  extra-modules-left := $(modules)
>  include extra-module.mk
>  
> -gconv-modules = gconv-modules.conf
> +gconv-modules = gconv-modules.conf gconv-modules-extra.conf
>  modpfx = $(objpfx)gconv-modules.d/

Ok.

> diff --git a/iconvdata/gconv-modules-extra.conf b/iconvdata/gconv-modules-extra.conf
> +++ b/iconvdata/gconv-modules-extra.conf
> @@ -0,0 +1,1889 @@
> +# GNU libc iconv configuration.
> +# Copyright (C) 1997-2021 Free Software Foundation, Inc.

Ok.

> +# This file is part of the GNU C Library.
> +
> +# The GNU C Library 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.
> +
> +# The GNU C Library 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 the GNU C Library; if not, see
> +# <https://www.gnu.org/licenses/>.
> +
> +# All lines contain the following information:
> +
> +# If the lines start with `module'
> +#  fromset:	either a name triple or a regular expression triple.
> +#  toset:	a name triple or an expression with \N to get regular
> +#		expression matching results.
> +#  filename:	filename of the module implementing the transformation.
> +#		If it is not absolute the path is made absolute by prepending
> +#		the directory the configuration file is found in.
> +#  cost:	optional cost of the transformation.  Default is 1.
> +
> +# If the lines start with `alias'
> +#  alias:	alias name which is not really recognized.
> +#  name:	the real name of the character set

Ok.

> +alias	ISO-IR-4//		BS_4730//

The rest is just moving lines.

Reviewed-by: DJ Delorie <dj@redhat.com>