From d1e08a20d169b8cbcca20987d709ae4eb25a3be8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 May 2021 06:39:52 -0700 Subject: dev86: depend on dev86-native for ifdefg Signed-off-by: Martin Jansa --- recipes-extended/dev86/dev86_git.bb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'recipes-extended/dev86/dev86_git.bb') diff --git a/recipes-extended/dev86/dev86_git.bb b/recipes-extended/dev86/dev86_git.bb index 476bf38f..c987342b 100644 --- a/recipes-extended/dev86/dev86_git.bb +++ b/recipes-extended/dev86/dev86_git.bb @@ -7,21 +7,23 @@ SECTION = "console/tools" BASE_PV="0.16.21" PV = "${BASE_PV}+git${SRCPV}" SRCREV = "e254e0b19651d3b8a20225b40281c9974a95dec4" -SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https" +SRC_URI = "git://github.com/jbruchon/${BPN}.git;protocol=https \ + file://0001-cpp-Makefile-respect-LDFLAGS-when-building-bcc-cpp.patch \ +" +SRC_URI_append_class-target = " \ + file://0002-Makefile-use-ifdefg-from-dev86-native-instead-of-tar.patch \ +" S = "${WORKDIR}/git" -DEPENDS = "gperf-native" +DEPENDS = "gperf-native dev86-native" BBCLASSEXTEND = "native" EXTRA_OEMAKE = "VERSION=${BASE_PV} PREFIX=${prefix} DIST=${D} LDFLAGS='${LDFLAGS}'" do_compile() { - # ${S}/Makefile does respect LDFLAGS, but ${S}/cpp/Makefile doesn't when building bcc-cpp - sed -i 's#$(CC) $(CFLAGS) -o bcc-cpp#$(CC) $(CFLAGS) $(LDFLAGS) -o bcc-cpp#g' ${S}/cpp/Makefile oe_runmake make.fil oe_runmake -f make.fil bcc86 as86 ld86 - } do_install() { @@ -33,8 +35,13 @@ do_install() { oe_runmake install-bcc ln -s ../lib/bcc/bcc-cpp ${D}${prefix}/bin/bcc-cpp ln -s ../lib/bcc/bcc-cc1 ${D}${prefix}/bin/bcc-cc1 +} +do_install_append_class-native() { + install -v -m 755 ${B}/ifdefg ${D}${bindir} } + COMPATIBLE_HOST = "(i.86|x86_64).*-linux" FILES_${PN} += "${libdir}/bcc" + INSANE_SKIP_${PN} = "already-stripped" -- cgit v1.2.3-54-g00ecf