diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2018-06-26 12:48:11 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-28 09:22:39 +0100 |
| commit | 543e39ad5e2baa0f1ece013a89483783e6b15dd9 (patch) | |
| tree | 23d9e123fe9dbeda3736a24f9d93e2fcb4e8b5cc | |
| parent | a39830b77f567e2361f1ced49bfdce52591e220c (diff) | |
| download | openembedded-core-543e39ad5e2baa0f1ece013a89483783e6b15dd9.tar.gz openembedded-core-543e39ad5e2baa0f1ece013a89483783e6b15dd9.tar.bz2 openembedded-core-543e39ad5e2baa0f1ece013a89483783e6b15dd9.zip | |
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.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cmake.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index fcfd5dda4f..fd40a9863e 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -54,8 +54,6 @@ EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} " OECMAKE_TARGET_COMPILE ?= "all" OECMAKE_TARGET_INSTALL ?= "install" -FILES_${PN}-dev += "${libdir}/cmake ${datadir}/cmake" - # CMake expects target architectures in the format of uname(2), # which do not always match TARGET_ARCH, so all the necessary # conversions should happen here. 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}" FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \ ${datadir}/aclocal ${base_libdir}/*.o \ - ${libdir}/${BPN}/*.la ${base_libdir}/*.la" + ${libdir}/${BPN}/*.la ${base_libdir}/*.la \ + ${libdir}/cmake ${datadir}/cmake" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" @@ -318,7 +319,6 @@ SECTION_${PN}-staticdev = "devel" RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})" FILES_${PN}-dbg = "/usr/lib/debug /usr/src/debug" - SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" |