diff options
author | Wenzong Fan <wenzong.fan@windriver.com> | 2014-09-17 01:56:38 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-26 05:41:53 +0200 |
commit | e99ca149a158b046ee02fcaa589df9cdca164f01 (patch) | |
tree | a1a35ef00f0043c730a4adcfea1b97f7e36c7f9b /meta-oe/recipes-support/talloc | |
parent | 711f3b8da8547b510235bfddfc6d4880017b7a37 (diff) | |
download | meta-openembedded-e99ca149a158b046ee02fcaa589df9cdca164f01.tar.gz |
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@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/talloc')
-rw-r--r-- | meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch | 2 | ||||
-rw-r--r-- | 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 e1339a078..635c60e46 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 | |||
17 | - which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true | 17 | - which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)`swig -swiglib` || true |
18 | - which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true | 18 | - which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)`swig -swiglib` || true |
19 | + which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)/$(SWIGLIBDIR) || true | 19 | + which swig >/dev/null 2>&1 && ${INSTALLCMD} -d $(DESTDIR)/$(SWIGLIBDIR) || true |
20 | + which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 talloc.i $(DESTDIR)/$(SWIGLIBDIR) || true | 20 | + which swig >/dev/null 2>&1 && ${INSTALLCMD} -m 644 $(srcdir)/$(tallocdir)/talloc.i $(DESTDIR)/$(SWIGLIBDIR) || true |
21 | 21 | ||
22 | doc:: talloc.3 talloc.3.html | 22 | doc:: talloc.3 talloc.3.html |
23 | 23 | ||
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 48c091599..9cf3e4322 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" | |||
18 | 18 | ||
19 | EXTRA_AUTORECONF = "--exclude=autopoint --exclude=aclocal" | 19 | EXTRA_AUTORECONF = "--exclude=autopoint --exclude=aclocal" |
20 | 20 | ||
21 | DEPENDS += "swig-native" | ||
22 | |||
21 | do_install_prepend() { | 23 | do_install_prepend() { |
22 | # Hack the way swig interface for talloc is installed | 24 | # Hack the way swig interface for talloc is installed |
23 | # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch | 25 | # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch |
24 | type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" | 26 | type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=`readlink -f ${SWIGLIBDIR}` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" |
25 | } | 27 | } |
26 | 28 | ||
27 | do_install_append() { | 29 | do_install_append() { |
@@ -29,7 +31,6 @@ do_install_append() { | |||
29 | ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 | 31 | ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 |
30 | ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 | 32 | ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 |
31 | ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so | 33 | ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so |
32 | rmdir ${D}${bindir} | ||
33 | } | 34 | } |
34 | 35 | ||
35 | PACKAGES += "${PN}-swig" | 36 | PACKAGES += "${PN}-swig" |