From fc5bfade69ca12d034967dc6b929dbe3dd715172 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 7 Jun 2021 14:22:20 +0530 Subject: iconvdata: Move gconv-modules configuration to gconv-modules.conf Move all gconv-modules configuration files to gconv-modules.conf. That is, the S390 extensions now become gconv-modules-s390.conf. Move both configuration files into gconv-modules.d. Now GCONV_PATH/gconv-modules is read only for backward compatibility for third-party gconv modules directories. Reviewed-by: DJ Delorie --- sysdeps/s390/Makefile | 16 ++++++++++-- sysdeps/s390/gconv-modules | 50 ------------------------------------ sysdeps/s390/gconv-modules-s390.conf | 50 ++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 52 deletions(-) delete mode 100644 sysdeps/s390/gconv-modules create mode 100644 sysdeps/s390/gconv-modules-s390.conf (limited to 'sysdeps/s390') diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index a8c49c9..ade8663 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -21,13 +21,25 @@ lib := iconvdata include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) extra-objs += $(addsuffix .so, $(s390x-iconv-modules)) -install-others += $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) +install-others += $(patsubst %, $(inst_gconvdir)/%.so, \ + $(s390x-iconv-modules)) \ + $(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf $(patsubst %, $(inst_gconvdir)/%.so, $(s390x-iconv-modules)) : \ $(inst_gconvdir)/%.so: $(objpfx)%.so $(+force) $(do-install-program) -sysdeps-gconv-modules = ../sysdeps/s390/gconv-modules +ifdef objpfx +generated += gconv-modules.d/gconv-modules-s390.conf +endif + +$(inst_gconvdir)/gconv-modules.d/gconv-modules-s390.conf: \ + $(modpfx)gconv-modules-s390.conf $(+force) + $(do-install) + +$(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \ + $(modpfx) + cp $< $@ endif ifeq ($(subdir),elf) diff --git a/sysdeps/s390/gconv-modules b/sysdeps/s390/gconv-modules deleted file mode 100644 index 8f210a0..0000000 --- a/sysdeps/s390/gconv-modules +++ /dev/null @@ -1,50 +0,0 @@ -# GNU libc iconv configuration. -# Copyright (C) 1997-2021 Free Software Foundation, Inc. -# 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 -# . - -# 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 - -# S/390 hardware accelerated modules -# from to module cost -module ISO-8859-1// IBM037// ISO-8859-1_CP037_Z900 1 -module IBM037// ISO-8859-1// ISO-8859-1_CP037_Z900 1 -module ISO-10646/UTF8/ UTF-32// UTF8_UTF32_Z9 1 -module UTF-32BE// ISO-10646/UTF8/ UTF8_UTF32_Z9 1 -module ISO-10646/UTF8/ UTF-32BE// UTF8_UTF32_Z9 1 -module UTF-16BE// UTF-32// UTF16_UTF32_Z9 1 -module UTF-32BE// UTF-16// UTF16_UTF32_Z9 1 -module INTERNAL UTF-16// UTF16_UTF32_Z9 1 -module UTF-32BE// UTF-16BE// UTF16_UTF32_Z9 1 -module INTERNAL UTF-16BE// UTF16_UTF32_Z9 1 -module UTF-16BE// UTF-32BE// UTF16_UTF32_Z9 1 -module UTF-16BE// INTERNAL UTF16_UTF32_Z9 1 -module UTF-16BE// ISO-10646/UTF8/ UTF8_UTF16_Z9 1 -module ISO-10646/UTF8/ UTF-16// UTF8_UTF16_Z9 1 -module ISO-10646/UTF8/ UTF-16BE// UTF8_UTF16_Z9 1 diff --git a/sysdeps/s390/gconv-modules-s390.conf b/sysdeps/s390/gconv-modules-s390.conf new file mode 100644 index 0000000..8f210a0 --- /dev/null +++ b/sysdeps/s390/gconv-modules-s390.conf @@ -0,0 +1,50 @@ +# GNU libc iconv configuration. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# 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 +# . + +# 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 + +# S/390 hardware accelerated modules +# from to module cost +module ISO-8859-1// IBM037// ISO-8859-1_CP037_Z900 1 +module IBM037// ISO-8859-1// ISO-8859-1_CP037_Z900 1 +module ISO-10646/UTF8/ UTF-32// UTF8_UTF32_Z9 1 +module UTF-32BE// ISO-10646/UTF8/ UTF8_UTF32_Z9 1 +module ISO-10646/UTF8/ UTF-32BE// UTF8_UTF32_Z9 1 +module UTF-16BE// UTF-32// UTF16_UTF32_Z9 1 +module UTF-32BE// UTF-16// UTF16_UTF32_Z9 1 +module INTERNAL UTF-16// UTF16_UTF32_Z9 1 +module UTF-32BE// UTF-16BE// UTF16_UTF32_Z9 1 +module INTERNAL UTF-16BE// UTF16_UTF32_Z9 1 +module UTF-16BE// UTF-32BE// UTF16_UTF32_Z9 1 +module UTF-16BE// INTERNAL UTF16_UTF32_Z9 1 +module UTF-16BE// ISO-10646/UTF8/ UTF8_UTF16_Z9 1 +module ISO-10646/UTF8/ UTF-16// UTF8_UTF16_Z9 1 +module ISO-10646/UTF8/ UTF-16BE// UTF8_UTF16_Z9 1 -- cgit v1.1