From 29372d984aea1459b53957055bccc9650c05e7f1 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 22 Sep 2008 20:22:34 +0000 Subject: pkgconfig.bbclass: fix some bugs and add enhancement * add ${libdir}/pkgconfig to FILES_${PN}-dev per default so all .pc files ends up in the right package * fix QA errors when the .pc file contains bad PATH's at install stage * fix do_stage_append dont look up the sourcedir, look up in image-dir to stage the .pc files --- classes/pkgconfig.bbclass | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'classes/pkgconfig.bbclass') diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index d65f8a6253..4192a04a0e 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -2,9 +2,18 @@ inherit base DEPENDS_prepend = "pkgconfig-native " +FILES_${PN}-dev += "${libdir}/pkgconfig" + +do_install_append () { + +for i in `find ${D}/ -name "*.pc"` ; do \ + sed -i -e 's:-L${STAGING_LIBDIR}::g' $i + done +} + do_stage_append () { install -d ${PKG_CONFIG_DIR} - for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do + for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` cat $pc > ${PKG_CONFIG_DIR}/$pcname done -- cgit v1.2.3 From 6956642867addc748f7f1ee2f676eb71ee275bf0 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 23 Sep 2008 21:17:15 +0000 Subject: pkgconfig.bbclass: unbreak stuff * sorry I missed and did not test what autotools.bbclass really does * let search for .pc in the source-dir and fix it there --- classes/pkgconfig.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'classes/pkgconfig.bbclass') diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index 4192a04a0e..6b9b80d90b 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -2,18 +2,16 @@ inherit base DEPENDS_prepend = "pkgconfig-native " -FILES_${PN}-dev += "${libdir}/pkgconfig" +do_install_prepend () { -do_install_append () { - -for i in `find ${D}/ -name "*.pc"` ; do \ +for i in `find ${S}/ -name "*.pc"` ; do \ sed -i -e 's:-L${STAGING_LIBDIR}::g' $i done } do_stage_append () { install -d ${PKG_CONFIG_DIR} - for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do + for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` cat $pc > ${PKG_CONFIG_DIR}/$pcname done -- cgit v1.2.3 From 4a4f7986f525b0a23adaf4877bead8aa48eb19fb Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 23 Sep 2008 21:46:52 +0000 Subject: pkgconfig.bbclass: do not mess with .pc dirs from quilt * add -type f to find command so we do not try to sed .pc dir from quilt --- classes/pkgconfig.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/pkgconfig.bbclass') diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index 6b9b80d90b..2a8199d135 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -4,7 +4,7 @@ DEPENDS_prepend = "pkgconfig-native " do_install_prepend () { -for i in `find ${S}/ -name "*.pc"` ; do \ +for i in `find ${S}/ -name "*.pc" -type f` ; do \ sed -i -e 's:-L${STAGING_LIBDIR}::g' $i done } -- cgit v1.2.3