[gimp/osx-build] OS X build: fix libffi misconfiguration

[Sven Claussner <sclaussner src gnome org>]

commit 3b9ee91f91a152c7615d8c2aef459c50d532f62e
Author: Sven Claussner <sclaussner src gnome org>
Date:   Wed May 28 21:46:11 2014 +0200

    OS X build: fix libffi misconfiguration
    
    Fix libffi's configure to return the real library path instead of an
    unresolved '$(libdir)' which also caused the glib build step to fail.

 build/osx/gimp.modules                             |    5 ++-
 ...-wrong-variable-substitution-in-configure.patch |   46 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/build/osx/gimp.modules b/build/osx/gimp.modules
index fbb60c1..d79d969 100755
--- a/build/osx/gimp.modules
+++ b/build/osx/gimp.modules
@@ -372,7 +372,10 @@
 
        <autotools id="libffi" autogenargs="--disable-builddir">
                <branch module="libffi/libffi-3.1.tar.gz" repo="sourceware.org"
-                       version="3.1" checkoutdir="libffi-3.1" />
+                       version="3.1" checkoutdir="libffi-3.1">
+                       <patch file="0004-Fix-wrong-variable-substitution-in-configure.patch"
+                               strip="1" />
+               </branch>
        </autotools>
 
        <autotools id="glib" autogenargs="--with-libiconv=native --enable-gtk-doc=no">
diff --git a/build/osx/patches/0004-Fix-wrong-variable-substitution-in-configure.patch 
b/build/osx/patches/0004-Fix-wrong-variable-substitution-in-configure.patch
new file mode 100755
index 0000000..eaa87f3
--- /dev/null
+++ b/build/osx/patches/0004-Fix-wrong-variable-substitution-in-configure.patch
@@ -0,0 +1,46 @@
+From bca25c81069a3229759333ad123f2f50fa0c1845 Mon Sep 17 00:00:00 2001
+From: Sven Claussner <sclaussner src gnome org>
+Date: Wed, 28 May 2014 21:24:31 +0200
+Subject: [PATCH] Fix wrong variable substitution in configure.ac
+
+Replace $(variable) by ${variable} to correctly resolve @toolexeclibdir@
+in libffi.pc.in. Otherwise it is resolved to '$(libdir)' instead of the
+real library path.
+---
+ configure | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index a05785e..ec456cd 100755
+--- a/configure
++++ b/configure
+@@ -18786,20 +18786,20 @@ fi
+ 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'
++    toolexecdir='${exec_prefix}/${target_alias}'
++    toolexeclibdir='${toolexecdir}/lib'
+   else
+-    toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+-    toolexeclibdir='$(libdir)'
++    toolexecdir='${libdir}/gcc-lib/${target_alias}'
++    toolexeclibdir='${libdir}'
+   fi
+   multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+   case $multi_os_directory in
+     .) ;; # Avoid trailing /.
+-    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
++    ../*) toolexeclibdir=${toolexeclibdir}/${multi_os_directory} ;;
+   esac
+ 
+ else
+-  toolexeclibdir='$(libdir)'
++  toolexeclibdir='${libdir}'
+ fi
+ 
+ 
+-- 
+2.0.0.rc2
+