summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-06-26 12:48:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-28 12:26:54 +0100
commit3fcec2cfa28fe9ff02ff5ae0c0c1ce9836ae5927 (patch)
tree0ce7a86751f0019a7bc0e382910b8137b98dff62 /meta/conf
parent25d3577a616d0a6b0d92cf6d73b322d1c6c7819b (diff)
downloadpoky-3fcec2cfa28fe9ff02ff5ae0c0c1ce9836ae5927.tar.gz
bitbake.conf: handle cmake -dev files packaging with default rules
Move packaging rules for cmake -dev files from cmake.bbclass into bitbake.conf to handle recipes (e.g. harfbuzz 1.8.1) which build with autotools but also install cmake -dev files. (From OE-Core rev: 543e39ad5e2baa0f1ece013a89483783e6b15dd9) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 44ec869a16..fbf5669ddd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -308,7 +308,8 @@ FILES_SOLIBSDEV ?= "${base_libdir}/lib*${SOLIBSDEV} ${libdir}/lib*${SOLIBSDEV}"
308FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ 308FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \
309 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ 309 ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
310 ${datadir}/aclocal ${base_libdir}/*.o \ 310 ${datadir}/aclocal ${base_libdir}/*.o \
311 ${libdir}/${BPN}/*.la ${base_libdir}/*.la" 311 ${libdir}/${BPN}/*.la ${base_libdir}/*.la \
312 ${libdir}/cmake ${datadir}/cmake"
312SECTION_${PN}-dev = "devel" 313SECTION_${PN}-dev = "devel"
313ALLOW_EMPTY_${PN}-dev = "1" 314ALLOW_EMPTY_${PN}-dev = "1"
314RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" 315RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
@@ -318,7 +319,6 @@ SECTION_${PN}-staticdev = "devel"
318RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" 319RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
319 320
320FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" 321FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug"
321
322SECTION_${PN}-dbg = "devel" 322SECTION_${PN}-dbg = "devel"
323ALLOW_EMPTY_${PN}-dbg = "1" 323ALLOW_EMPTY_${PN}-dbg = "1"
324 324