Author: adconrad
Date: 2013-01-24 06:39:39 +0000 (Thu, 24 Jan 2013)
New Revision: 5452
Added:
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-ldso-machine-mismatch.diff
glibc-package/branches/eglibc-2.17/debian/patches/i386/unsubmitted-quiet-ldconfig.diff
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/patches/series
Log:
* debian/patches/any/unsubmitted-ldso-machine-mismatch.diff: Skip past
libraries that are built for other machines, rather than erroring.
* debian/patches/i386/unsubmitted-quiet-ldconfig.diff: Fix ldconfig on
x86 to stop complaining so loudly about wrong-arch libraries on path.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-24 03:57:56 UTC
(rev 5451)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-24 06:39:39 UTC
(rev 5452)
@@ -64,6 +64,10 @@
* debian/rules: Fix EGLIBC_VERSION epoch parsing breakage (LP: #929565)
* debian/patches/any/cvs-tst-array-as-needed.diff: Fix tst-array2 and
tst-array5 to build with --no-as-needed to prevent test regressions.
+ * debian/patches/any/unsubmitted-ldso-machine-mismatch.diff: Skip past
+ libraries that are built for other machines, rather than erroring.
+ * debian/patches/i386/unsubmitted-quiet-ldconfig.diff: Fix ldconfig on
+ x86 to stop complaining so loudly about wrong-arch libraries on path.
[ Matthias Klose ]
* debian/{rules,rules.d/control.mk,control.in/libc}: Allow turning off
Added:
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-ldso-machine-mismatch.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-ldso-machine-mismatch.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.17/debian/patches/any/unsubmitted-ldso-machine-mismatch.diff
2013-01-24 06:39:39 UTC (rev 5452)
@@ -0,0 +1,15 @@
+--- glibc/elf/dl-load.c 2013-01-23 20:55:08.648614327 -0700
++++ glibc/elf/dl-load.c 2013-01-23 20:55:52.852612764 -0700
+@@ -2008,6 +2008,12 @@
+ goto close_and_out;
+ }
+ #endif
++ else if (! __builtin_expect (elf_machine_matches_host (ehdr), 1))
++ {
++ /* Another non-fatal error, let's skip right past the
++ the libraries obviously built for other machines. */
++ goto close_and_out;
++ }
+ else if (ehdr->e_ident[EI_DATA] != byteorder)
+ {
+ if (BYTE_ORDER == BIG_ENDIAN)
Added:
glibc-package/branches/eglibc-2.17/debian/patches/i386/unsubmitted-quiet-ldconfig.diff
===================================================================
---
glibc-package/branches/eglibc-2.17/debian/patches/i386/unsubmitted-quiet-ldconfig.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.17/debian/patches/i386/unsubmitted-quiet-ldconfig.diff
2013-01-24 06:39:39 UTC (rev 5452)
@@ -0,0 +1,16 @@
+--- x/sysdeps/unix/sysv/linux/i386/readelflib.c 2012-03-21
14:25:11.000000000 -0600
++++ x/sysdeps/unix/sysv/linux/i386/readelflib.c 2013-01-23
21:17:58.748565867 -0700
+@@ -62,8 +62,11 @@
+ #ifndef SKIP_EM_IA_64
+ failed:
+ #endif
+- error (0, 0, _("%s is for unknown machine %d.\n"),
+- file_name, elf_header->e_machine);
++ if (opt_verbose)
++ {
++ error (0, 0, _("%s is for unknown machine %d.\n"),
++ file_name, elf_header->e_machine);
++ }
+ return 1;
+ }
+
Modified: glibc-package/branches/eglibc-2.17/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-24
03:57:56 UTC (rev 5451)
+++ glibc-package/branches/eglibc-2.17/debian/patches/series 2013-01-24
06:39:39 UTC (rev 5452)
@@ -121,6 +121,7 @@
i386/local-cpuid-level2.diff
i386/local-linuxthreads-gscope.diff
i386/submitted-i686-timing.diff
+i386/unsubmitted-quiet-ldconfig.diff
ia64/local-dlfptr.diff
ia64/submitted-libm.diff
@@ -222,3 +223,4 @@
any/local-revert-bz13979.diff
any/local-tst-eintr1-eagain.diff
any/cvs-tst-array-as-needed.diff
+any/unsubmitted-ldso-machine-mismatch.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tygtn-0004ja...@vasks.debian.org
