summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libffi/libffi/not-win32.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libffi/libffi/not-win32.patch')
-rw-r--r--meta/recipes-support/libffi/libffi/not-win32.patch20
1 files changed, 16 insertions, 4 deletions
diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch
index 1e90125edd..f4ed839ed8 100644
--- a/meta/recipes-support/libffi/libffi/not-win32.patch
+++ b/meta/recipes-support/libffi/libffi/not-win32.patch
@@ -1,3 +1,8 @@
+From be9d4cc110c159812699780348686da371296b94 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Thu, 4 Feb 2016 16:22:50 +0000
+Subject: [PATCH] libffi: ensure sysroot paths are not in libffi.pc
+
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
@@ -10,13 +15,20 @@ As this block is generally pointless, disable it.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
---- 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 @@
+diff --git a/configure.ac b/configure.ac
+index 816bfd6..e37c5a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -401,7 +401,7 @@ AC_ARG_ENABLE(multi-os-directory,
+
# 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
+ test x"$with_cross_host" != x"no"; then
+ toolexecdir='${exec_prefix}'/'$(target_alias)'