X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=d7474c9f3e1887a299aea2a44100e4f207997a26;hb=340fb6fe7e6d31f73e8610d7f6fa3984555470fb;hp=3f101dffedd38a7a9c365b5284f6ed87dc2846d3;hpb=22c42ec32752ea67b5071df32fd9997a3f4d7346;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 3f101df..d7474c9 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -109,10 +109,10 @@ $(libffi_STAMP_CONFIGURE):
 	cd libffi && $(TAR) -zxf tarball/libffi*.tar.gz
 	mv libffi/libffi-* libffi/build
 	chmod +x libffi/ln
-	cd libffi && $(PATCH) -p0 < libffi.dllize-3.0.6.patch
-
-	# This patch is just the resulting delta from running automake, autoreconf, libtoolize --force --copy
-	cd libffi && "$(PATCH)" -p0 < libffi.autotools-update.patch
+	cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch
+	# This patch is just the resulting delta from running
+	# automake && autoreconf && libtoolize --force --copy
+	cd libffi/build && "$(PATCH)" -p1 < ../libffi.autotools-update-3.0.8.patch
 
 # Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn
 # warnings off or the compilation of libffi might fail due to warnings