Contrib: Fix liboil cpu detection

Fix provided by NightStrike from mingw-w64 project

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d03827636d9b18e3352388b630752a11f16d3b9c..96fa02eef0c1754d32851d888b1fb4dd194b8909 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2463,6 +2463,8 @@ liboil-$(OIL_VERSION).tar.gz:
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -d liboil -p1 < Patches/liboil-noshared.patch
+       patch -d liboil -p1 < Patches/liboil-Xcompile.patch
+
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS

diff --git a/extras/contrib/src/Patches/liboil-Xcompile.patch b/extras/contrib/src/Patches/liboil-Xcompile.patch
new file mode 100644 (file)
index 0000000..313a3e8
--- /dev/null
+++ b/extras/contrib/src/Patches/liboil-Xcompile.patch
@@ -0,0 +1,12 @@
+diff -ruN liboil.new/m4/as-unaligned-access.m4 liboil/m4/as-unaligned-access.m4
+--- liboil.new/m4/as-unaligned-access.m4       2009-08-18 10:59:02.000000000 +0200
++++ liboil/m4/as-unaligned-access.m4   2009-08-18 10:59:32.000000000 +0200
+@@ -4,7 +4,7 @@
+ AC_DEFUN([AS_UNALIGNED_ACCESS], [
+   AC_MSG_CHECKING([if unaligned memory access works correctly])
+   if test x"$as_cv_unaligned_access" = x ; then
+-    case $host in
++    case $host_cpu in
+       alpha*|arm*|hp*|mips*|sh*|sparc*|ia64*)
+         _AS_ECHO_N([(blacklisted) ])
+         as_cv_unaligned_access=no