This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] S/390: Regenerate gconv-modules.cache if necessary
- From: "Andreas Krebbel" <krebbel at linux dot vnet dot ibm dot com>
- To: libc-alpha at sourceware dot org
- Date: Wed, 7 Apr 2010 11:20:19 +0200
- Subject: [PATCH] S/390: Regenerate gconv-modules.cache if necessary
Hi,
a bug in the S/390 specific makefile causes the gconv-modules.cache
file not to be updated when installing the modules. The attached
patch copies the commands from iconvdata/Makefile to the S/390
Makefile overriding the gconv module installation rule. I've verified
that the cache gets regenerated by starting with an empty cache.
Please apply if the patch is ok.
Bye,
-Andreas-
2010-04-07 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* sysdeps/s390/s390-64/Makefile: Regenerate the
gconv-modules.cache if necessary. Commands are copied from
iconvdata/Makefile.
Index: glibc/sysdeps/s390/s390-64/Makefile
===================================================================
--- glibc.orig/sysdeps/s390/s390-64/Makefile 2009-08-03 10:18:31.000000000 +0200
+++ glibc/sysdeps/s390/s390-64/Makefile 2010-04-07 10:01:35.000000000 +0200
@@ -74,5 +74,17 @@ $(objpfx)gconv-modules-s390: gconv-modul
$(inst_gconvdir)/gconv-modules: $(objpfx)gconv-modules-s390 $(+force)
$(do-install)
+ifeq (no,$(cross-compiling))
+# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
+# if this libc has more gconv modules than the previously installed one.
+ if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
+ LC_ALL=C LANGUAGE=C \
+ $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
+ $(common-objpfx)iconv/iconvconfig \
+ $(addprefix --prefix=,$(install_root)); \
+ fi
+else
+ @echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
+endif
endif