From b168b3ac94f2a35eea0bbb82ddd67e466dbfb5ba Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 13 Jun 2019 08:01:11 +0800 Subject: serf: cleanup recipe * Inherit scons bbclass and use the task definitions from there. * Remove the DEPENDS on python3-scons-native that is already present in scons class. (From OE-Core rev: 1522f09a4dd21fef177d514cb4d37e94d140dd33) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-support/serf/serf_1.3.9.bb | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'meta/recipes-support/serf/serf_1.3.9.bb') diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.9.bb index 706c86be47..92cd5ca061 100644 --- a/meta/recipes-support/serf/serf_1.3.9.bb +++ b/meta/recipes-support/serf/serf_1.3.9.bb @@ -14,18 +14,19 @@ SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -DEPENDS = "python3-scons-native openssl apr apr-util util-linux expat" +inherit scons -do_compile() { - ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} \ - CC="${CC}" \ - APR=`which apr-1-config` APU=`which apu-1-config` \ - CFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \ - OPENSSL="${STAGING_EXECPREFIXDIR}" -} +DEPENDS += " openssl apr apr-util util-linux expat" -do_install() { - ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} LIBDIR=${D}${libdir} install -} +EXTRA_OESCONS = " \ + LIBDIR=${libdir} \ + --install-sandbox=${D} \ + CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + APR=`which apr-1-config` \ + APU=`which apu-1-config` \ + OPENSSL="${STAGING_EXECPREFIXDIR}" \ + " BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf