[jhbuild] Add a temporary patch to use "lib" as libdir in libffi

[Paolo Borelli <pborelli src gnome org>]

commit 243e4e1016b73c90f446ce5dbb11e470a08fc69c
Author: Paolo Borelli <pborelli gnome org>
Date:   Wed Aug 20 10:58:05 2014 +0200

    Add a temporary patch to use "lib" as libdir in libffi
    
    It seems libffi always uses lib64 on x86_64, but that does not play well
    with the new jhbuild strategy. Add a hacky patch to avoid this.
    See https://sourceware.org/ml/libffi-discuss/2014/msg00078.html

 modulesets/bootstrap.modules        |    4 +++-
 patches/libffi-toolexeclibdir.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
index a1e1029..0acf2d2 100644
--- a/modulesets/bootstrap.modules
+++ b/modulesets/bootstrap.modules
@@ -108,7 +108,9 @@
 
   <autotools id="libffi" autogen-sh="configure">
     <branch repo="sourceware" module="libffi/libffi-3.0.13.tar.gz" version="3.0.13"
-            size="845747" hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c"/>
+            size="845747" hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c">
+      <patch file="libffi-toolexeclibdir.patch" strip="0"/>
+    </branch>
   </autotools>
 
   <autotools id="libpng" autogen-sh="configure">
diff --git a/patches/libffi-toolexeclibdir.patch b/patches/libffi-toolexeclibdir.patch
new file mode 100644
index 0000000..ad5f36f
--- /dev/null
+++ b/patches/libffi-toolexeclibdir.patch
@@ -0,0 +1,30 @@
+--- configure.orig     2014-08-20 09:06:04.662429549 +0200
++++ configure  2014-08-20 09:06:37.324364017 +0200
+@@ -14829,26 +14829,7 @@
+ fi
+ 
+ 
+-# 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 test -n "$with_cross_host" &&
+-     test x"$with_cross_host" != x"no"; then
+-    toolexecdir='$(exec_prefix)/$(target_alias)'
+-    toolexeclibdir='$(toolexecdir)/lib'
+-  else
+-    toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+-    toolexeclibdir='$(libdir)'
+-  fi
+-  multi_os_directory=`$CC -print-multi-os-directory`
+-  case $multi_os_directory in
+-    .) ;; # Avoid trailing /.
+-    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+-  esac
+-
+-else
+-  toolexeclibdir='$(libdir)'
+-fi
++toolexeclibdir='$(libdir)'
+ 
+ 
+ ac_config_commands="$ac_config_commands include"