From: Robert Yang Date: Fri, 10 Jul 2015 07:14:47 +0000 (-0700) Subject: elfutils 0.163: remove do_configure_prepend X-Git-Tag: 2015-10~1276 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f960c02620941493b99769cf31f426421d3969fb;p=openembedded-core.git elfutils 0.163: remove do_configure_prepend It is derived from elfutils 0.148, but 0.162 doesn't need them, it doesn't need i386_dis.h or x86_64_dis.h either, there are the same two files in the source, so move elfutils/i386_dis.h to elfutils-0.148/i386_dis.h and elfutils/x86_64_dis.h to elfutils-0.148/x86_64_dis.h for elfutils 0.148 only. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/elfutils/elfutils/i386_dis.h b/meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils/i386_dis.h rename to meta/recipes-devtools/elfutils/elfutils-0.148/i386_dis.h diff --git a/meta/recipes-devtools/elfutils/elfutils/x86_64_dis.h b/meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h similarity index 100% rename from meta/recipes-devtools/elfutils/elfutils/x86_64_dis.h rename to meta/recipes-devtools/elfutils/elfutils-0.148/x86_64_dis.h diff --git a/meta/recipes-devtools/elfutils/elfutils_0.163.bb b/meta/recipes-devtools/elfutils/elfutils_0.163.bb index b34bfdd4b9..c4fdabdb31 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.163.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.163.bb @@ -42,22 +42,12 @@ SRC_URI_append_libc-uclibc = " file://uclibc-support-for-elfutils-0.161.patch" # which can not pass the cross compiling, so let's work around it by adding 2 .h files # along with the do_configure_prepend() -SRC_URI += "\ - file://i386_dis.h \ - file://x86_64_dis.h \ -" inherit autotools gettext EXTRA_OECONF = "--program-prefix=eu- --without-lzma" EXTRA_OECONF_append_class-native = " --without-bzlib" EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc" -do_configure_prepend() { - sed -i '/^i386_dis.h:/,+4 {/.*/d}' ${S}/libcpu/Makefile.am - - cp ${WORKDIR}/*dis.h ${S}/libcpu -} - do_install_append() { if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then rm ${D}${bindir}/eu-objdump