X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libffi%2Fghc.mk;h=ae41881f090dd4d1504e5d57fe4397acb63bf8fd;hb=72547264724117d689a7fa400104185557fb2a0c;hp=4613447d4c4e03c9485edbd84e71cfec67cb499a;hpb=0ef6ba7b28187a4bf5309f9702eeaf53a281204b;p=ghc-hetmet.git

diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index 4613447..ae41881 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -82,7 +82,7 @@ libffi_DYNAMIC_PROG = $(libffi_HS_DYN_LIB).a
 libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
 else
 libffi_DYNAMIC_PROG =
-libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.7
+libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.9
 endif
 
 ifeq "$(BuildSharedLibs)" "YES"
@@ -109,19 +109,21 @@ $(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
 	cd libffi && \
 	  (set -o igncr 2>/dev/null) && set -o igncr; export SHELLOPTS; \
 	    PATH=`pwd`:$$PATH; \
 	    export PATH; \
 	    cd build && \
 	    CC=$(WhatGccIsCalled) \
-        CFLAGS="$(SRC_CC_OPTS)" \
-        LDFLAGS="$(SRC_LD_OPTS)" \
+        CFLAGS="$(SRC_CC_OPTS) -w" \
+        LDFLAGS="$(SRC_LD_OPTS) -w" \
         "$(SHELL)" configure \
 	          --enable-static=yes \
 	          --enable-shared=$(libffi_EnableShared) \