diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-07-06 21:38:49 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-07-06 21:38:49 -0400 |
| commit | c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b (patch) | |
| tree | 2ce557dea9d98d155a0954e8b8ab63b165c27e24 | |
| parent | ecaddd66991f5dc237f26cfdef51507019cfcc01 (diff) | |
| download | glibc-c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b.tar.gz glibc-c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b.tar.xz glibc-c0cfb5eb3da59b9ed1fd1e06825b6dd62534b42b.zip | |
Fix for installation in sysdeps/s390/s390-64/Makefile
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/Makefile | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 6ac3ae0b89..8ad847a6d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-06-21 Andreas Jaeger <aj@suse.de> + + * sysdeps/s390/s390-64/Makefile ($(inst_gconvdir)/gconv-modules): + Copy rule from iconvdata/Makefile. + 2011-07-06 Ulrich Drepper <drepper@gmail.com> [BZ #12922] diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile index 1814f37abd..1dd3acf732 100644 --- a/sysdeps/s390/s390-64/Makefile +++ b/sysdeps/s390/s390-64/Makefile @@ -74,5 +74,17 @@ $(objpfx)gconv-modules-s390: gconv-modules $(+force) $(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 |