summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/pkgconfig.bbclass11
-rw-r--r--packages/libtool/libtool-sdk_2.2.4.bb3
2 files changed, 12 insertions, 2 deletions
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
diff --git a/packages/libtool/libtool-sdk_2.2.4.bb b/packages/libtool/libtool-sdk_2.2.4.bb
index b6b2aa966c..e92c4dbfaf 100644
--- a/packages/libtool/libtool-sdk_2.2.4.bb
+++ b/packages/libtool/libtool-sdk_2.2.4.bb
@@ -1,7 +1,7 @@
require libtool.inc
require libtool_${PV}.bb
-PR = "r0"
+PR = "r1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://cross_compile.patch;patch=1"
@@ -40,6 +40,7 @@ do_stage () {
install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}
install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
install -d ${STAGING_DATADIR}/libtool/config/