diff options
| -rw-r--r-- | classes/autotools.bbclass | 4 | ||||
| -rw-r--r-- | classes/distutils-common-base.bbclass | 1 | ||||
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | recipes/iso-codes/iso-codes_1.4.bb | 12 |
4 files changed, 10 insertions, 9 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 20f371a987..e43b289c56 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 068eac4de8..9ca392b84a 100644 --- a/classes/distutils-common-base.bbclass +++ b/classes/distutils-common-base.bbclass @@ -17,6 +17,7 @@ PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" FILES_${PN}-dev += "\ + ${datadir}/pkgconfig \ ${libdir}/pkgconfig \ ${libdir}/${PYTHON_DIR}/site-packages/*.la \ " diff --git a/conf/bitbake.conf b/conf/bitbake.conf index e5073a1b93..30ee0ae9bc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -224,7 +224,7 @@ SECTION_${PN}-doc = "doc" FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ - ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" + ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal ${datadir}/pkgconfig" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})" diff --git a/recipes/iso-codes/iso-codes_1.4.bb b/recipes/iso-codes/iso-codes_1.4.bb index f424701f47..ad4f8db562 100644 --- a/recipes/iso-codes/iso-codes_1.4.bb +++ b/recipes/iso-codes/iso-codes_1.4.bb @@ -1,12 +1,8 @@ LICENSE = "LGPL" +PACKAGE_ARCH = "all" +SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2" +PR = "r2" -SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2" - -inherit autotools pkgconfig +inherit autotools_stage FILES_${PN} += "${datadir}/xml/" - -do_stage() { - autotools_stage_all -} - |