elfutils: install shared libelf libs on host build

And fix libelf detection

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
MilhouseVH 2018-06-27 09:40:03 +01:00
parent ea4cd5c38a
commit a84b6e0cb3
4 changed files with 29 additions and 2 deletions

View File

@ -8,7 +8,7 @@ PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.zlib.net"
PKG_URL="http://zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_HOST=""
PKG_DEPENDS_HOST="cmake:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_SECTION="compress"
PKG_SHORTDESC="zlib: A general purpose (ZIP) data compression library"

View File

@ -8,6 +8,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://sourceware.org/elfutils/"
PKG_URL="https://sourceware.org/elfutils/ftp/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_HOST="make:host zlib:host"
PKG_DEPENDS_TARGET="toolchain zlib"
PKG_SECTION="devel"
PKG_SHORTDESC="elfutils: collection of utilities to handle ELF objects"
@ -21,6 +22,16 @@ PKG_CONFIGURE_OPTS_TARGET="utrace_cv_cc_biarch=false \
--without-bzlib \
--without-lzma"
PKG_CONFIGURE_OPTS_HOST="utrace_cv_cc_biarch=false \
--disable-nls \
--with-zlib \
--without-bzlib \
--without-lzma"
makeinstall_host() {
make DESTDIR="$INSTALL" -C libelf install
}
make_target() {
make V=1 -C libelf libelf.a
make V=1 -C libebl libebl.a

View File

@ -67,7 +67,7 @@ if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG
fi
if [ "$TARGET_ARCH" = "x86_64" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware"
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host"
fi
if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then

View File

@ -0,0 +1,16 @@
diff --git a/Makefile b/Makefile
index c9132594860b..9551c8bc5e91 100644
--- a/Makefile
+++ b/Makefile
@@ -933,7 +933,7 @@ export mod_sign_cmd
ifdef CONFIG_STACK_VALIDATION
has_libelf := $(call try-run,\
- echo "int main() {}" | $(HOSTCC) -xc -o /dev/null -lelf -,1,0)
+ echo "int main() {}" | $(HOSTCC) $(HOSTCFLAGS) -xc -o /dev/null $(HOSTLDFLAGS) -lelf -,1,0)
ifeq ($(has_libelf),1)
objtool_target := tools/objtool FORCE
else
--
2.11.0