diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:20:04 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-10 03:20:04 +0200 |
commit | 1b8dfe266937a37a4c642f96ceb2347bf4c00a17 (patch) | |
tree | 0c6aab146bb3c82efd9c7846a9a4e70dcb0ec84f /meta-oe/recipes-support/talloc | |
download | meta-openembedded-daisy-140929.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-support/talloc')
-rw-r--r-- | meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch | 23 | ||||
-rw-r--r-- | meta-oe/recipes-support/talloc/talloc_2.0.1.bb | 38 |
2 files changed, 61 insertions, 0 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 new file mode 100644 index 0000000000..e1339a078e --- /dev/null +++ b/meta-oe/recipes-support/talloc/talloc/install-swig-interface-in-SWINGLIBDIR.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Using the way swig interface is installed leads to a bad path in ${D}. | ||
2 | The interface ended up in ${D}/${STAGING_DIR_NATIVE} which is wrong. The | ||
3 | fix is to define a variable in recipe which is used in install rule by | ||
4 | talloc. | ||
5 | |||
6 | Upstream-Status: Inappropriate [build system specific] | ||
7 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
8 | |||
9 | Index: talloc-2.0.1/talloc.mk | ||
10 | =================================================================== | ||
11 | --- talloc-2.0.1.orig/talloc.mk 2009-10-11 16:42:24.000000000 +0300 | ||
12 | +++ talloc-2.0.1/talloc.mk 2012-09-13 23:15:05.283539702 +0300 | ||
13 | @@ -23,8 +23,8 @@ | ||
14 | ${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig | ||
15 | if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi | ||
16 | if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi | ||
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 | ||
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 | ||
21 | |||
22 | doc:: talloc.3 talloc.3.html | ||
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 new file mode 100644 index 0000000000..6b7e4f1cfd --- /dev/null +++ b/meta-oe/recipes-support/talloc/talloc_2.0.1.bb | |||
@@ -0,0 +1,38 @@ | |||
1 | SUMMARY = "Hierarchical, reference counted memory pool system with destructors" | ||
2 | HOMEPAGE = "http://talloc.samba.org" | ||
3 | LICENSE = "LGPL-3.0" | ||
4 | LIC_FILES_CHKSUM = "file://NEWS;md5=5fe776b23a711c9153ee94bc87e47334" | ||
5 | |||
6 | inherit autotools pkgconfig | ||
7 | |||
8 | SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz \ | ||
9 | file://install-swig-interface-in-SWINGLIBDIR.patch \ | ||
10 | " | ||
11 | SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b" | ||
12 | SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4" | ||
13 | |||
14 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
15 | |||
16 | PR = "r2" | ||
17 | |||
18 | # autoreconf doesn't work well while reconfiguring included libreplace | ||
19 | do_configure () { | ||
20 | gnu-configize | ||
21 | oe_runconf | ||
22 | } | ||
23 | |||
24 | do_install_prepend() { | ||
25 | # Hack the way swig interface for talloc is installed | ||
26 | # This hack is accompanied by install-swig-interface-in-SWINGLIBDIR.patch | ||
27 | type swig > /dev/null 2>&1 && SWIGLIBDIR=`swig -swiglib` && SWIGLIBDIR=${SWIGLIBDIR##${STAGING_DIR_NATIVE}} && export SWIGLIBDIR || echo "No swig found" | ||
28 | } | ||
29 | |||
30 | do_install_append() { | ||
31 | install -d ${D}${libdir} | ||
32 | ln -s libtalloc.so.2.0.1 ${D}${libdir}/libtalloc.so.2.0 | ||
33 | ln -s libtalloc.so.2.0 ${D}${libdir}/libtalloc.so.2 | ||
34 | ln -s libtalloc.so.2 ${D}${libdir}/libtalloc.so | ||
35 | } | ||
36 | |||
37 | PACKAGES += "${PN}-swig" | ||
38 | FILES_${PN}-swig += "${datadir}" | ||