summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-04 16:22:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:39:03 +0000
commitfad264b7e7898abbbc0d51407996da54a00eec4d (patch)
treeeeaac72c47f2b1057fe11a5ef31c38b3fa1f0335 /meta/recipes-support
parentd3753dd6c34a381b0fdd0d69d3a8408101c34de5 (diff)
downloadpoky-fad264b7e7898abbbc0d51407996da54a00eec4d.tar.gz
libffi: move from recipes-gnome to recipes-support
(From OE-Core rev: a2c43ffe55e022cb5621d549c8aae914c6fa54a1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch32
-rw-r--r--meta/recipes-support/libffi/libffi/not-win32.patch22
-rw-r--r--meta/recipes-support/libffi/libffi_3.2.1.bb26
3 files changed, 80 insertions, 0 deletions
diff --git a/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch b/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
new file mode 100644
index 0000000000..db96e63547
--- /dev/null
+++ b/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
@@ -0,0 +1,32 @@
1From a5efaa96fd934eb245c234a5275fcf62698ef986 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 2 Apr 2015 21:38:03 -0700
4Subject: [PATCH] mips: Use compiler internal define for linux
5
6__linux__ is defined by compiler when building for
7linux platforms, lets use it
8
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 src/mips/ffitarget.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/mips/ffitarget.h b/src/mips/ffitarget.h
18index 717d659..6faa358 100644
19--- a/src/mips/ffitarget.h
20+++ b/src/mips/ffitarget.h
21@@ -32,7 +32,7 @@
22 #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead."
23 #endif
24
25-#ifdef linux
26+#ifdef __linux__
27 # include <asm/sgidefs.h>
28 #elif defined(__rtems__)
29 /*
30--
312.1.4
32
diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch
new file mode 100644
index 0000000000..1e90125edd
--- /dev/null
+++ b/meta/recipes-support/libffi/libffi/not-win32.patch
@@ -0,0 +1,22 @@
1libffi's configure assumes that cross-compiled builds are complicated and
2introduces convoluted path manipulation involving gcc search paths to the
3install paths, resulting in paths like -L/usr/lib/../lib/ appearing in
4libffi.pc. When pkg-config is then used to obtain the linker flags for libffi
5it can't tell that this path is on the default search path and returns
6$SYSROOT/usr/lib/../lib which then gets written all over the target sysroot.
7This then means the sstate can't be shared and triggers QA errors.
8
9As this block is generally pointless, disable it.
10
11Upstream-Status: Inappropriate
12Signed-off-by: Ross Burton <ross.burton@intel.com>
13
14--- a/configure.ac~ 2014-11-12 11:56:51.000000000 +0000
15+++ b/configure.ac 2016-02-04 14:02:53.765710532 +0000
16@@ -593,5 +593,5 @@
17 # These variables are only ever used when we cross-build to X86_WIN32.
18 # And we only support this with GCC, so...
19-if test "x$GCC" = "xyes"; then
20+if false; then
21 if test -n "$with_cross_host" &&
22 test x"$with_cross_host" != x"no"; then \ No newline at end of file
diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb b/meta/recipes-support/libffi/libffi_3.2.1.bb
new file mode 100644
index 0000000000..72e25fb9d5
--- /dev/null
+++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
@@ -0,0 +1,26 @@
1SUMMARY = "A portable foreign function interface library"
2DESCRIPTION = "The `libffi' library provides a portable, high level programming interface to various calling \
3conventions. This allows a programmer to call any function specified by a call interface description at run \
4time. FFI stands for Foreign Function Interface. A foreign function interface is the popular name for the \
5interface that allows code written in one language to call code written in another language. The `libffi' \
6library really only provides the lowest, machine dependent layer of a fully featured foreign function interface. \
7A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
8
9LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b"
11
12SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \
13 file://not-win32.patch \
14 file://0001-mips-Use-compiler-internal-define-for-linux.patch \
15 "
16
17SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
18SRC_URI[sha256sum] = "d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37"
19
20EXTRA_OECONF += "--disable-builddir"
21
22inherit autotools texinfo
23
24FILES_${PN}-dev += "${libdir}/libffi-${PV}"
25
26BBCLASSEXTEND = "native nativesdk"