[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Patches] FSF merges 2012-03-03



Hi!

On Sat, 3 Mar 2012 18:32:23 +0000 (UTC), "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx> wrote:
> I've done merges from FSF to EGLIBC trunk and 2.15 branch.

I figured out that the following patch is needed to make the new
elf/tst-unused-dep.out test functional in a cross-testing environment, to
avoid to (try to) execute it on the build system:

	* elf/Makefile ($(objpfx)tst-unused-dep.out): Run through the
	cross-test-wrapper.

Index: elf/Makefile
===================================================================
--- elf/Makefile	(revision 17601)
+++ elf/Makefile	(working copy)
@@ -1142,6 +1142,8 @@
 tests: $(objpfx)tst-unused-dep.out
 
 $(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
+	$(cross-test-wrapper) \
+	/usr/bin/env \
 	LD_TRACE_LOADED_OBJECTS=1 \
 	LD_DEBUG=unused \
 	LD_PRELOAD= \

Snippet of before/after diff for cross-testing sh-linux-gnu:

    -LD_TRACE_LOADED_OBJECTS=1 \
    +[...]/wrapper/run  \
    +       /usr/bin/env \
    +       LD_TRACE_LOADED_OBJECTS=1 \
            LD_DEBUG=unused \
            LD_PRELOAD= \
            [glibc build]/elf/ld-linux.so.2 \
              --library-path [...] \
              [glibc build]/elf/testobj1.so > [glibc build]/elf/tst-unused-dep.out
    -/bin/sh: [glibc build]/elf/ld-linux.so.2: cannot execute binary file
    -make[3]: *** [[glibc build]/elf/tst-unused-dep.out] Error 126
    -  Failed to remake target file `[glibc build]/elf/tst-unused-dep.out'.
    +cmp [glibc build]/elf/tst-unused-dep.out /dev/null > /dev/null


GrÃÃe,
 Thomas

Attachment: pgp8plkMD4TrG.pgp
Description: PGP signature

_______________________________________________
Patches mailing list
Patches@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/patches