2011-06-27 14:05:13 +02:00
|
|
|
2011-06-21 Andreas Jaeger <aj@suse.de>
|
|
|
|
|
|
|
|
|
|
* sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules):
|
|
|
|
|
Copy rule from iconvdata/Makefile.
|
|
|
|
|
|
2011-02-04 05:30:37 +01:00
|
|
|
Index: glibc/sysdeps/s390/s390-64/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- sysdeps/s390/s390-64/Makefile 2009-08-03 10:18:31.000000000 +0200
|
|
|
|
|
+++ 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
|
