[oe-commits] Wenzong Fan : talloc: fix swig dependencies
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 29 02:51:28 UTC 2014
Module: meta-openembedded.git
Branch: master
Commit: e99ca149a158b046ee02fcaa589df9cdca164f01
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=e99ca149a158b046ee02fcaa589df9cdca164f01
Author: Wenzong Fan <wenzong.fan at windriver.com>
Date: Wed Sep 17 01:56:38 2014 -0400
talloc: fix swig dependencies
* depens on swig-native to make sure that the talloc.i always be
installed;
* remove relative path that from `swig -swiglib`:
${D}/usr/bin/../share -> ${D}/usr/share
This prevents 'install' from creraing empty dir: ${D}${bindir};
* fix the path to talloc.i for separate build.
Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch | 2 +-
meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch b/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch
index e1339a0..635c60e 100644
--- a/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch
+++ b/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch
@@ -17,7 +17,7 @@ Index: talloc-2.0.1/talloc.mk
- which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true
- which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true
+ which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)/$(SWIGLIBDIR) || true
-+ which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)/$(SWIGLIBDIR) || true
++ which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 $(srcdir)/$(tallocdir)/talloc.i $(DESTDIR)/$(SWIGLIBDIR) || true
doc:: talloc.3 talloc.3.html
diff --git a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
index 48c0915..9cf3e43 100644
--- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
+++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb
@@ -18,10 +18,12 @@ PR = "r2"
EXTRA_AUTORECONF = "--exclude=autopoint --exclude=aclocal"
+DEPENDS += "swig-native"
+
do_install_prepend() {
# Hack the way swig interface for talloc is installed
# This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch
- type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found"
+ type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=`readlink -f ${SWIGLIBDIR}` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found"
}
do_install_append() {
@@ -29,7 +31,6 @@ do_install_append() {
ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0
ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2
ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so
- rmdir ${D}${bindir}
}
PACKAGES += "${PN}-swig"
More information about the Openembedded-commits
mailing list