From b4a4b421bd7d8268c5a7e66b87a7b4281afcbe39 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 3 Sep 2020 21:31:52 +0100 Subject: kea: don't use PACKAGECONFIG inappropriately The Kea recipe has PACKAGECONFIG options for boost, openssl, and log4cplus. However, these are not optional but mandatory dependencies. Remove the PACKAGECONFIGs and replace with explicit DEPENDS and EXTRA_OECONF. Also the RDEPENDS in the PACKAGECONFIGs are redundant as the library dependencies are generated correctly. (From OE-Core rev: d58dc77ab71ea85f8f12ea4ca2e28e0afee60440) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/kea/kea_1.7.7.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/kea/kea_1.7.7.bb b/meta/recipes-connectivity/kea/kea_1.7.7.bb index c69a180833..d2e41e0db2 100644 --- a/meta/recipes-connectivity/kea/kea_1.7.7.bb +++ b/meta/recipes-connectivity/kea/kea_1.7.7.bb @@ -5,6 +5,8 @@ SECTION = "connectivity" LICENSE = "MPL-2.0 & Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" +DEPENDS = "boost log4cplus openssl" + SRC_URI = "\ http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0001-remove-AC_TRY_RUN.patch \ @@ -30,6 +32,10 @@ DEBUG_OPTIMIZATION_append_mipsel = " -O" BUILD_OPTIMIZATION_remove_mipsel = " -Og" BUILD_OPTIMIZATION_append_mipsel = " -O" +EXTRA_OECONF = "--with-boost-libs=-lboost_system \ + --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \ + --with-openssl=${STAGING_DIR_TARGET}${prefix}" + do_configure_prepend() { # replace abs_top_builddir to avoid introducing the build path # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target @@ -49,12 +55,6 @@ do_install_append() { rm -rf "${D}${localstatedir}" } -PACKAGECONFIG ??= "openssl log4cplus boost" - -PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl" -PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus" -PACKAGECONFIG[boost] = "--with-boost-libs=-lboost_system,,boost,boost" - FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" FILES_${PN} += "${libdir}/hooks/*.so" -- cgit v1.2.3-54-g00ecf