Patchwork elfutils: remove i386_dis.h/x86_64_dis.h compilation targets

login
register
mail settings
Submitter Laurentiu Palcu
Date March 28, 2013, 1:51 p.m.
Message ID <1364478718-21290-1-git-send-email-laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/47079/
State Accepted
Commit a4ebe0f6efc8ed93521e75919f23821f59934c1f
Headers show

Comments

Laurentiu Palcu - March 28, 2013, 1:51 p.m.
Since we provide those files manually (i386_gendis, which is needed for
generating those files, has to be run on host and would fail when
compiling for other architectures), the mentioned compilation targets
in libcpu/ are not needed anymore.

This change will avoid a nasty race condition when running "make -jX
install" resulting in a zero size libebl_i386.so file. The issue happens
because, at "make install" time, the *_dis.h prerequisites will be newer
than the target itself, triggering a chain of recompilations while, in
the same time, the binary files are copied to the destination directory.
Hence, the zero sized file...

[YOCTO #4131]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/recipes-devtools/elfutils/elfutils_0.148.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
index e8d58fb..9c0a08e 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb
@@ -52,7 +52,7 @@  EXTRA_OECONF_append_class-native = " --without-bzlib"
 EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc"
 
 do_configure_prepend() {
-	sed -i 's:./i386_gendis:echo\ \#:g' ${S}/libcpu/Makefile.am
+	sed -i '/^i386_dis.h:/,+4 {/.*/d}' ${S}/libcpu/Makefile.am
 
 	cp ${WORKDIR}/*dis.h ${S}/libcpu
 }