diff options
Diffstat (limited to 'meta/recipes-support/libffi/libffi')
| -rw-r--r-- | meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-support/libffi/libffi/not-win32.patch | 22 |
2 files changed, 54 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 @@ +From a5efaa96fd934eb245c234a5275fcf62698ef986 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 2 Apr 2015 21:38:03 -0700 +Subject: [PATCH] mips: Use compiler internal define for linux + +__linux__ is defined by compiler when building for +linux platforms, lets use it + + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/mips/ffitarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mips/ffitarget.h b/src/mips/ffitarget.h +index 717d659..6faa358 100644 +--- a/src/mips/ffitarget.h ++++ b/src/mips/ffitarget.h +@@ -32,7 +32,7 @@ + #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." + #endif + +-#ifdef linux ++#ifdef __linux__ + # include <asm/sgidefs.h> + #elif defined(__rtems__) + /* +-- +2.1.4 + 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 @@ +libffi's configure assumes that cross-compiled builds are complicated and +introduces convoluted path manipulation involving gcc search paths to the +install paths, resulting in paths like -L/usr/lib/../lib/ appearing in +libffi.pc. When pkg-config is then used to obtain the linker flags for libffi +it can't tell that this path is on the default search path and returns +$SYSROOT/usr/lib/../lib which then gets written all over the target sysroot. +This then means the sstate can't be shared and triggers QA errors. + +As this block is generally pointless, disable it. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- a/configure.ac~ 2014-11-12 11:56:51.000000000 +0000 ++++ b/configure.ac 2016-02-04 14:02:53.765710532 +0000 +@@ -593,5 +593,5 @@ + # These variables are only ever used when we cross-build to X86_WIN32. + # And we only support this with GCC, so... +-if test "x$GCC" = "xyes"; then ++if false; then + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then
\ No newline at end of file |