Make the libffi patch files portable

Solaris's patch can't apply them if the lines beginning "---" aren't
preceeded by a "diff -ur foo bar" line.

2 files changed, 209 insertions, 202 deletions

diff --git a/libffi/libffi-autotools-update.patch b/libffi/libffi-autotools-update.patch
index 9f8a1e73d8..dd9d9c97c9 100644
--- a/libffi/libffi-autotools-update.patch
+++ b/libffi/libffi-autotools-update.patch
@@ -1,5 +1,155 @@
---- libffi-3.0.6/configure	2008-07-17 15:07:39.000000000 +0200
-+++ build/configure	2008-10-14 09:55:37.000000000 +0200
+diff -Nur libffi-3.0.6/Makefile.in build/Makefile.in
+--- libffi-3.0.6/Makefile.in	2008-02-21 13:36:18.000000000 +0000
++++ build/Makefile.in	2009-01-23 17:56:34.000000000 +0000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -216,6 +216,7 @@
+ AMTAR = @AMTAR@
+ AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
+ AR = @AR@
++AS = @AS@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+@@ -235,6 +236,8 @@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -251,6 +254,8 @@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
++LIBFFI_DLL = @LIBFFI_DLL@
++LIBFFI_LDFLAGS = @LIBFFI_LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+@@ -259,6 +264,8 @@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
++NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -420,7 +427,7 @@
+ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
+ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
+ AM_CFLAGS = -Wall -g -fexceptions
+-libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
++libffi_la_LDFLAGS = $(LIBFFI_LDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ AM_CCASFLAGS = $(AM_CPPFLAGS)
+ all: fficonfig.h
+@@ -486,8 +493,8 @@
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -495,8 +502,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p=$(am__strip_dir) \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -1203,8 +1210,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+@@ -1229,8 +1236,8 @@
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -1240,13 +1247,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) fficonfig.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+-	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS) fficonfig.h.in $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$tags $$unique
+@@ -1320,6 +1326,10 @@
+ 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ 	$(am__remove_distdir)
+ 
++dist-lzma: distdir
++	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++	$(am__remove_distdir)
++
+ dist-tarZ: distdir
+ 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ 	$(am__remove_distdir)
+@@ -1346,6 +1356,8 @@
+ 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ 	*.tar.bz2*) \
+ 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.lzma*) \
++	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ 	*.tar.Z*) \
+ 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ 	*.shar.gz*) \
+@@ -1612,8 +1624,8 @@
+ 	all all-am am--refresh check check-am clean clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+ 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+-	dist-info dist-shar dist-tarZ dist-zip distcheck distclean \
+-	distclean-compile distclean-generic distclean-hdr \
++	dist-info dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++	distclean distclean-compile distclean-generic distclean-hdr \
+ 	distclean-libtool distclean-tags distcleancheck distdir \
+ 	distuninstallcheck dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-dvi \
+diff -Nur libffi-3.0.6/configure build/configure
+--- libffi-3.0.6/configure	2008-07-17 14:07:39.000000000 +0100
++++ build/configure	2009-01-23 17:56:34.000000000 +0000
 @@ -860,6 +860,8 @@
  CCASDEPMODE
  am__fastdepCCAS_TRUE
@@ -2200,156 +2350,9 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
---- libffi-3.0.6/Makefile.in	2008-02-21 14:36:18.000000000 +0100
-+++ build/Makefile.in	2008-10-14 09:55:38.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -216,6 +216,7 @@
- AMTAR = @AMTAR@
- AM_RUNTESTFLAGS = @AM_RUNTESTFLAGS@
- AR = @AR@
-+AS = @AS@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-@@ -235,6 +236,8 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -251,6 +254,8 @@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
-+LIBFFI_DLL = @LIBFFI_DLL@
-+LIBFFI_LDFLAGS = @LIBFFI_LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-@@ -259,6 +264,8 @@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
- MKDIR_P = @MKDIR_P@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -420,7 +427,7 @@
- libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
- nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
- AM_CFLAGS = -Wall -g -fexceptions
--libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-+libffi_la_LDFLAGS = $(LIBFFI_LDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version`
- AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
- AM_CCASFLAGS = $(AM_CPPFLAGS)
- all: fficonfig.h
-@@ -486,8 +493,8 @@
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- 	  else :; fi; \
- 	done
- 
-@@ -495,8 +502,8 @@
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- 	done
- 
- clean-libLTLIBRARIES:
-@@ -1203,8 +1210,8 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
-@@ -1229,8 +1236,8 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- 	  test -n "$$unique" || unique=$$empty_fix; \
- 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -1240,13 +1247,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) fficonfig.h.in $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
--	here=`pwd`; \
- 	list='$(SOURCES) $(HEADERS) fficonfig.h.in $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
- 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- 	     $$tags $$unique
-@@ -1320,6 +1326,10 @@
- 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- 	$(am__remove_distdir)
- 
-+dist-lzma: distdir
-+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+	$(am__remove_distdir)
-+
- dist-tarZ: distdir
- 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- 	$(am__remove_distdir)
-@@ -1346,6 +1356,8 @@
- 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
- 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.lzma*) \
-+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
-@@ -1612,8 +1624,8 @@
- 	all all-am am--refresh check check-am clean clean-generic \
- 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
- 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
--	dist-info dist-shar dist-tarZ dist-zip distcheck distclean \
--	distclean-compile distclean-generic distclean-hdr \
-+	dist-info dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-+	distclean distclean-compile distclean-generic distclean-hdr \
- 	distclean-libtool distclean-tags distcleancheck distdir \
- 	distuninstallcheck dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am install-dvi \
---- libffi-3.0.6/ltmain.sh	2008-01-29 13:28:14.000000000 +0100
-+++ build/ltmain.sh	2008-02-28 09:33:19.000000000 +0100
+diff -Nur libffi-3.0.6/ltmain.sh build/ltmain.sh
+--- libffi-3.0.6/ltmain.sh	2008-01-29 12:28:14.000000000 +0000
++++ build/ltmain.sh	2009-01-23 17:56:34.000000000 +0000
 @@ -2,7 +2,7 @@
  # NOTE: Changing this file will not affect anything until you rerun configure.
  #
diff --git a/libffi/libffi-dllize-3.0.6.patch b/libffi/libffi-dllize-3.0.6.patch
index 8f60f23d75..6a19f1119d 100644
--- a/libffi/libffi-dllize-3.0.6.patch
+++ b/libffi/libffi-dllize-3.0.6.patch
@@ -1,5 +1,42 @@
---- libffi-3.0.6/include/ffi.h.in	2008-04-03 20:57:34.000000000 +0200
-+++ build/include/ffi.h.in	2008-10-14 09:51:55.000000000 +0200
+diff -Nur libffi-3.0.6/Makefile.am build/Makefile.am
+--- libffi-3.0.6/Makefile.am	2008-02-21 13:36:18.000000000 +0000
++++ build/Makefile.am	2009-01-23 17:56:09.000000000 +0000
+@@ -165,7 +165,7 @@
+ 
+ AM_CFLAGS = -Wall -g -fexceptions
+ 
+-libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
++libffi_la_LDFLAGS = $(LIBFFI_LDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+ 
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ AM_CCASFLAGS = $(AM_CPPFLAGS)
+diff -Nur libffi-3.0.6/configure.ac build/configure.ac
+--- libffi-3.0.6/configure.ac	2008-07-17 13:57:33.000000000 +0100
++++ build/configure.ac	2009-01-23 17:56:09.000000000 +0000
+@@ -26,6 +26,20 @@
+ 
+ AM_PROG_AS
+ AM_PROG_CC_C_O
++
++AC_LIBTOOL_WIN32_DLL
++AC_SUBST(LIBFFI_DLL,0)
++
++case $host in
++  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++    if test "$enable_shared" = yes; then
++      LIBFFI_LDFLAGS="-no-undefined -Wl,--export-all-symbols"
++      LIBFFI_DLL=1
++    fi
++    ;;
++esac
++AC_SUBST(LIBFFI_LDFLAGS)
++
+ AC_PROG_LIBTOOL
+ 
+ AM_MAINTAINER_MODE
+diff -Nur libffi-3.0.6/include/ffi.h.in build/include/ffi.h.in
+--- libffi-3.0.6/include/ffi.h.in	2008-04-03 19:57:34.000000000 +0100
++++ build/include/ffi.h.in	2009-01-23 17:56:09.000000000 +0000
 @@ -61,6 +61,17 @@
  #define @TARGET@
  #endif
@@ -141,31 +178,9 @@
  
  /* Useful for eliminating compiler warnings */
  #define FFI_FN(f) ((void (*)(void))f)
---- build/Makefile.am	2008-02-21 14:21:24.000000000 +0100
-+++ build-shared/Makefile.am	2008-10-11 20:44:15.000000000 +0200
-@@ -165,7 +165,7 @@
- 
- AM_CFLAGS = -Wall -g -fexceptions
- 
--libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-+libffi_la_LDFLAGS = $(LIBFFI_LDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version`
- 
- AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
- AM_CCASFLAGS = $(AM_CPPFLAGS)
---- build/src/x86/win32.S	2008-02-15 02:17:20.000000000 +0100
-+++ build-shared/src/x86/win32.S	2008-10-11 19:19:03.000000000 +0200
-@@ -33,8 +33,6 @@
-  
- .text
-  
--.globl ffi_prep_args
-- 
-         # This assumes we are using gas.
-         .balign 16
- .globl _ffi_call_SYSV
-
---- build/include/ffi_common.h	2008-01-29 16:15:17.000000000 +0100
-+++ build-shared/include/ffi_common.h	2008-10-13 00:35:02.000000000 +0200
+diff -Nur libffi-3.0.6/include/ffi_common.h build/include/ffi_common.h
+--- libffi-3.0.6/include/ffi_common.h	2008-07-12 06:43:00.000000000 +0100
++++ build/include/ffi_common.h	2009-01-23 17:56:09.000000000 +0000
 @@ -49,9 +49,9 @@
  #endif
  
@@ -188,26 +203,15 @@
  
  /* Extended cif, used in callback from assembly routine */
  typedef struct
---- build/configure.ac	2008-02-24 18:20:21.000000000 +0100
-+++ build-shared/configure.ac	2008-10-13 19:20:04.000000000 +0200
-@@ -26,6 +26,20 @@
- 
- AM_PROG_AS
- AM_PROG_CC_C_O
-+
-+AC_LIBTOOL_WIN32_DLL
-+AC_SUBST(LIBFFI_DLL,0)
-+
-+case $host in
-+  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+    if test "$enable_shared" = yes; then
-+      LIBFFI_LDFLAGS="-no-undefined -Wl,--export-all-symbols"
-+      LIBFFI_DLL=1
-+    fi
-+    ;;
-+esac
-+AC_SUBST(LIBFFI_LDFLAGS)
-+
- AC_PROG_LIBTOOL
- 
- AM_MAINTAINER_MODE
+diff -Nur libffi-3.0.6/src/x86/win32.S build/src/x86/win32.S
+--- libffi-3.0.6/src/x86/win32.S	2008-02-15 01:24:06.000000000 +0000
++++ build/src/x86/win32.S	2009-01-23 17:56:09.000000000 +0000
+@@ -33,8 +33,6 @@
+  
+ .text
+  
+-.globl ffi_prep_args
+- 
+         # This assumes we are using gas.
+         .balign 16
+ .globl _ffi_call_SYSV