* [PATCH 0/1][meta-oe] talloc: fix swig dependencies
@ 2014-09-12 8:58 wenzong.fan
2014-09-12 8:58 ` [PATCH 1/1][meta-oe] " wenzong.fan
0 siblings, 1 reply; 2+ messages in thread
From: wenzong.fan @ 2014-09-12 8:58 UTC (permalink / raw)
To: openembedded-devel
From: Wenzong Fan <wenzong.fan@windriver.com>
Changes include:
* 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.
The following changes since commit 28e26a9b0ad37d0c92ba42b2727215eef1edf5a2:
tcpslice: add recipe under tcpdump (2014-09-09 10:32:51 -0400)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/talloc-swig
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/talloc-swig
Wenzong Fan (1):
talloc: fix swig dependencies
.../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(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1][meta-oe] talloc: fix swig dependencies
2014-09-12 8:58 [PATCH 0/1][meta-oe] talloc: fix swig dependencies wenzong.fan
@ 2014-09-12 8:58 ` wenzong.fan
0 siblings, 0 replies; 2+ messages in thread
From: wenzong.fan @ 2014-09-12 8:58 UTC (permalink / raw)
To: openembedded-devel
From: Wenzong Fan <wenzong.fan@windriver.com>
* 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@windriver.com>
---
.../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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-12 8:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-12 8:58 [PATCH 0/1][meta-oe] talloc: fix swig dependencies wenzong.fan
2014-09-12 8:58 ` [PATCH 1/1][meta-oe] " wenzong.fan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.