[oe] [CLASSES][PATCH] fully support ${datadir}/pkgconfig

[Stanislav Brabec]

${datadir}/pkgconfig is a legal pkg-config directory for arch
independent stuff. Only half of its support is done in global stuff (it
is in PKG_CONFIG_PATH). Attached patch makes its support complete:

- Adding ${datadir}/pkgconfig/*.pc to the default -dev package pattern.

- AUTOTOOLS_STAGE_PKGCONFIG knows about it.

Example of package fixed by this patch: iso-codes-dev

Signed-off-by: Stanislav Brabec <utx at penguin.cz>


diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 20f371a..e43b289 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -231,6 +231,10 @@ autotools_stage_all() {
 			echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/"
 			cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
 		fi
+		if [ -e ${STAGE_TEMP}/${datadir}/pkgconfig/ ] ; then
+			echo "cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/"
+			cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/
+		fi
 	fi
 	rm -rf ${STAGE_TEMP}/${mandir} || true
 	rm -rf ${STAGE_TEMP}/${infodir} || true
diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass
index 068eac4..cd6bdf2 100644
--- a/classes/distutils-common-base.bbclass
+++ b/classes/distutils-common-base.bbclass
@@ -19,6 +19,7 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
 FILES_${PN}-dev += "\
   ${libdir}/pkgconfig \
   ${libdir}/${PYTHON_DIR}/site-packages/*.la \
+  ${datadir}/pkgconfig \
 "
 FILES_${PN}-dbg = "\
   ${libdir}/${PYTHON_DIR}/site-packages/.debug \
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index f31e56d..2e6d38a 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -221,7 +221,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
 SECTION_${PN}-doc = "doc"
 
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
-                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
+                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
                 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"

-- 
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus