aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2012-10-08 14:04:23 -0700
committerJonathan Nieder <jrnieder@gmail.com>2012-10-08 14:04:23 -0700
commit72bd208846535725ea28b8173e79ef60e57a968c (patch)
treee4d1da8d38ec65ac70f0ca39e5bf8fef9135556a
parent55f115345ab8b9e0f149d07ee0f825cfb47c0a41 (diff)
downloadglibc-72bd208846535725ea28b8173e79ef60e57a968c.tar
glibc-72bd208846535725ea28b8173e79ef60e57a968c.tar.gz
glibc-72bd208846535725ea28b8173e79ef60e57a968c.tar.bz2
glibc-72bd208846535725ea28b8173e79ef60e57a968c.zip
nptl_db/Makefile: force C locale when running readelf
db-symbols.awk relies on English-language readelf output to find the beginning of the symbol table, so force the locale. Without this change, "make check" fails in non-English locales: | diff -p -U 0 ../sysdeps/unix/sysv/linux/x86_64/64/nptl/libthread_db.abilist [...]/nptl_db/libthread_db.symlist | readelf -W -s [...]/nptl/libpthread.so | gawk -f [...]/nptl_db/db-symbols.v.i > [...]/nptl_db/db-symbols.out | make[2]: *** [[...]/nptl_db/db-symbols.out] Erreur 1
-rw-r--r--nptl_db/ChangeLog6
-rw-r--r--nptl_db/Makefile2
2 files changed, 7 insertions, 1 deletions
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index fe1778ee95..417514978b 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-08 Jonathan Nieder <jrnieder@gmail.com>
+
+ [BZ #14661]
+ * Makefile ($(objpfx)db-symbols.out): Force C locale when running
+ readelf -s.
+
2012-03-07 Ulrich Drepper <drepper@gmail.com>
* Makefile (distribute): Remove variable.
diff --git a/nptl_db/Makefile b/nptl_db/Makefile
index d15fb9e818..6ccb3d0ccb 100644
--- a/nptl_db/Makefile
+++ b/nptl_db/Makefile
@@ -60,6 +60,6 @@ $(objpfx)libthread_db.so: $(common-objpfx)libc.so \
tests: $(objpfx)db-symbols.out
$(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \
$(common-objpfx)nptl/libpthread.so
- readelf -W -s $(filter %.so,$^) | $(AWK) -f $< > $@
+ LC_ALL=C readelf -W -s $(filter %.so,$^) | $(AWK) -f $< > $@
$(objpfx)db-symbols.v.i: db-symbols.awk