summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-09-03 21:31:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-05 22:19:20 +0100
commitb4a4b421bd7d8268c5a7e66b87a7b4281afcbe39 (patch)
treeba49da1aad34d61f4b877ce00a44308a5bf16904 /meta
parente2fabd7e5fcca3f8c551ceea2225317a1abd60e2 (diff)
downloadpoky-b4a4b421bd7d8268c5a7e66b87a7b4281afcbe39.tar.gz
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 <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/kea/kea_1.7.7.bb12
1 files changed, 6 insertions, 6 deletions
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"
5LICENSE = "MPL-2.0 & Apache-2.0" 5LICENSE = "MPL-2.0 & Apache-2.0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa" 6LIC_FILES_CHKSUM = "file://COPYING;md5=68d95543d2096459290a4e6b9ceccffa"
7 7
8DEPENDS = "boost log4cplus openssl"
9
8SRC_URI = "\ 10SRC_URI = "\
9 http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ 11 http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
10 file://0001-remove-AC_TRY_RUN.patch \ 12 file://0001-remove-AC_TRY_RUN.patch \
@@ -30,6 +32,10 @@ DEBUG_OPTIMIZATION_append_mipsel = " -O"
30BUILD_OPTIMIZATION_remove_mipsel = " -Og" 32BUILD_OPTIMIZATION_remove_mipsel = " -Og"
31BUILD_OPTIMIZATION_append_mipsel = " -O" 33BUILD_OPTIMIZATION_append_mipsel = " -O"
32 34
35EXTRA_OECONF = "--with-boost-libs=-lboost_system \
36 --with-log4cplus=${STAGING_DIR_TARGET}${prefix} \
37 --with-openssl=${STAGING_DIR_TARGET}${prefix}"
38
33do_configure_prepend() { 39do_configure_prepend() {
34 # replace abs_top_builddir to avoid introducing the build path 40 # replace abs_top_builddir to avoid introducing the build path
35 # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target 41 # 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() {
49 rm -rf "${D}${localstatedir}" 55 rm -rf "${D}${localstatedir}"
50} 56}
51 57
52PACKAGECONFIG ??= "openssl log4cplus boost"
53
54PACKAGECONFIG[openssl] = "--with-openssl=${STAGING_DIR_TARGET}${prefix},,openssl,openssl"
55PACKAGECONFIG[log4cplus] = "--with-log4cplus=${STAGING_DIR_TARGET}${prefix},,log4cplus,log4cplus"
56PACKAGECONFIG[boost] = "--with-boost-libs=-lboost_system,,boost,boost"
57
58FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a" 58FILES_${PN}-staticdev += "${libdir}/kea/hooks/*.a ${libdir}/hooks/*.a"
59FILES_${PN} += "${libdir}/hooks/*.so" 59FILES_${PN} += "${libdir}/hooks/*.so"
60 60