bitbake.conf: handle cmake -dev files packaging with default rules

PATCH New Andre McCurdy 1 participant 1 message Jun 26, 2018

Share & tools

Andre McCurdy

author

2018-06-26 19:48 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 meta/classes/cmake.bbclass | 2 --
 meta/conf/bitbake.conf     | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

meta/classes/cmake.bbclass +0 -2

index fcfd5dd..fd40a98 100644
@@ -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.

meta/conf/bitbake.conf +2 -2

index d9f7b66..f0ac614 100644
@@ -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"

Signature · 1 line

1.9.1