diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-04 15:48:26 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-06-04 15:48:26 +0000 |
| commit | 8548b3be8c48bf62bd4e20fb0ee958338b01bc6c (patch) | |
| tree | 874deff152fded2f5b50110ee6d488d42605bb01 /libc/locale | |
| parent | eab7f6089510455a9b26643c64da331749a15650 (diff) | |
Merge changes between r23097 and r23217 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@23218 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale')
| -rw-r--r-- | libc/locale/Makefile | 6 | ||||
| -rw-r--r-- | libc/locale/programs/locarchive.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libc/locale/Makefile b/libc/locale/Makefile index e826d3054..6242bcc82 100644 --- a/libc/locale/Makefile +++ b/libc/locale/Makefile @@ -117,9 +117,3 @@ cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \ $(locale-modules) $(lib-modules)) lib := locale-programs include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) - -# Depend on libc.so so a DT_NEEDED is generated in the shared objects. -# This ensures they will load libc.so for needed symbols if loaded by -# a statically-linked program that hasn't already loaded it. -$(objpfx)libBrokenLocale.so: $(common-objpfx)libc.so \ - $(common-objpfx)libc_nonshared.a diff --git a/libc/locale/programs/locarchive.c b/libc/locale/programs/locarchive.c index 1a8a69653..8475e295a 100644 --- a/libc/locale/programs/locarchive.c +++ b/libc/locale/programs/locarchive.c @@ -111,7 +111,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) /* Create a temporary file in the correct directory. */ fd = mkstemp (fname); if (fd == -1) - error (EXIT_FAILURE, errno, _("cannot create temporary file")); + error (EXIT_FAILURE, errno, _("cannot create temporary file: %s"), fname); /* Create the initial content of the archive. */ head.magic = AR_MAGIC; @@ -346,7 +346,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) /* Create a temporary file in the correct directory. */ fd = mkstemp (fname); if (fd == -1) - error (EXIT_FAILURE, errno, _("cannot create temporary file")); + error (EXIT_FAILURE, errno, _("cannot create temporary file: %s"), fname); /* Copy the existing head information. */ newhead = *head; |