liboil: fix building for x86_64

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 37 insertions, 42 deletions

diff --git a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.ac.diff b/patches/liboil-0.3.16/0001-liboil-don-t-check-for-assembler-options-and-add-com.patch
index 2c3125757..275c83ea2 100644
--- a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.ac.diff
+++ b/patches/liboil-0.3.16/0001-liboil-don-t-check-for-assembler-options-and-add-com.patch
@@ -1,19 +1,20 @@
-Subject: liboil: don't check for assembler options and add compiler options
 From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 4 Aug 2014 17:45:42 +0200
+Subject: [PATCH] liboil: don't check for assembler options and add compiler
+ options
 
 Checking for "-Wa,-mfpu=vfp" and then adding "-mfpu=vfp" os of course nonsense.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
 ---
- configure.ac |    4 ++--
+ configure.ac | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: liboil-0.3.15/configure.ac
-===================================================================
---- liboil-0.3.15.orig/configure.ac
-+++ liboil-0.3.15/configure.ac
-@@ -188,10 +188,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_
+diff --git a/configure.ac b/configure.ac
+index a657101..38bd436 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -188,10 +188,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
  fi
  
  if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
diff --git a/patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch b/patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch
new file mode 100644
index 000000000..86f6d76df
--- /dev/null
+++ b/patches/liboil-0.3.16/0002-fix-unaligned-access-whitelist-check.patch
@@ -0,0 +1,22 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 4 Aug 2014 17:47:38 +0200
+Subject: [PATCH] fix unaligned access whitelist check
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ m4/as-unaligned-access.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/as-unaligned-access.m4 b/m4/as-unaligned-access.m4
+index ede8bd2..3496505 100644
+--- a/m4/as-unaligned-access.m4
++++ b/m4/as-unaligned-access.m4
+@@ -4,7 +4,7 @@ dnl check if unaligned memory access works correctly
+ 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
diff --git a/patches/liboil-0.3.16/autogen.sh b/patches/liboil-0.3.16/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/liboil-0.3.16/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff b/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff
deleted file mode 100644
index f04595b50..000000000
--- a/patches/liboil-0.3.16/liboil-0.3.13-fix-configure.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: liboil: don't check for assembler options and add compiler options
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-Checking for "-Wa,-mfpu=vfp" and then adding "-mfpu=vfp" os of course nonsense.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-[mkl: ported to configure]
-Singed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
----
- configure |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: liboil-0.3.16/configure
-===================================================================
---- liboil-0.3.16.orig/configure
-+++ liboil-0.3.16/configure
-@@ -17458,11 +17458,11 @@ fi
- 
- if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
- 
--  { echo "$as_me:$LINENO: checking to see if compiler understands \"-Wa,-mfpu=vfp\"" >&5
--echo $ECHO_N "checking to see if compiler understands \"-Wa,-mfpu=vfp\"... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking to see if compiler understands \"-mfpu=vfp\"" >&5
-+echo $ECHO_N "checking to see if compiler understands \"-mfpu=vfp\"... $ECHO_C" >&6; }
- 
-   save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS "-Wa,-mfpu=vfp""
-+  CFLAGS="$CFLAGS "-mfpu=vfp""
- 
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
diff --git a/patches/liboil-0.3.16/series b/patches/liboil-0.3.16/series
index 49c69a04d..d5a53b3f8 100644
--- a/patches/liboil-0.3.16/series
+++ b/patches/liboil-0.3.16/series
@@ -1,2 +1,5 @@
-liboil-0.3.13-fix-configure.ac.diff
-liboil-0.3.13-fix-configure.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-liboil-don-t-check-for-assembler-options-and-add-com.patch
+0002-fix-unaligned-access-whitelist-check.patch
+# a45ce1b5bbcfaf2b379d89609c26c1d1  - git-ptx-patches magic