diff options
| author |   Andrei Gherzan <andrei@gherzan.ro> | 2012-10-03 13:41:30 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-10-04 15:52:27 +0200 |
| commit | d4c73cbdfede37e9dce069e8770c112f16ce0b5a (patch) | |
| tree | 66e83c2a2a9dca3e9ff74a4f8866b8f13e548581 /meta-oe/recipes-support/talloc/talloc_2.0.1.bb | |
| parent | 3871d4561464eedc6a9a83b2c682ec7d29682873 (diff) | |
| download | meta-openembedded-d4c73cbdfede37e9dce069e8770c112f16ce0b5a.tar.gz | |
talloc: Fix swig interface install path
Using the way swig interface is installed leads to a bad path in ${D}.
The interface ended up in ${D}/${STAGING_DIR_NATIVE} which is wrong. The
fix is to define a variable in recipe which is used in install rule by
talloc.
As well, LICENSE variable modified to reflect the real license:
LGPL-3.0
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support/talloc/talloc_2.0.1.bb')
| -rw-r--r-- | meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 17 |
1 files changed, 14 insertions, 3 deletions
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 a69bd401e0..6aa5a9e80b 100644 --- a/meta-oe/recipes-support/talloc/talloc_2.0.1.bb +++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb @@ -1,17 +1,19 @@ DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors" HOMEPAGE = "http://talloc.samba.org" -LICENSE = "LGPL" +LICENSE = "LGPL-3.0" LIC_FILES_CHKSUM = "file://NEWS;md5=5fe776b23a711c9153ee94bc87e47334" inherit autotools pkgconfig -SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz \ + file://install-swig-interface-in-SWINGLIBDIR.patch \ + " SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b" SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4" TARGET_CC_ARCH += "${LDFLAGS}" -PR = "r1" +PR = "r2" # autoreconf doesn't work well while reconfiguring included libreplace do_configure () { @@ -19,9 +21,18 @@ do_configure () { oe_runconf } +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" +} + do_install_append() { install -d ${D}${libdir} 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 } + +PACKAGES += "${PN}-swig" +FILES_${PN}-swig += "${datadir}" |