[liboil] simplyfy patches

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10462 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 33 insertions, 33 deletions

diff --git a/patches/liboil-0.3.16/generic/liboil-0.3.12-ltmain_sh.diff b/patches/liboil-0.3.16/generic/liboil-0.3.12-ltmain_sh.diff
deleted file mode 100644
index 2790dd81a..000000000
--- a/patches/liboil-0.3.16/generic/liboil-0.3.12-ltmain_sh.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-# 
-# Submitted-By: Guillaume GOURAT, 2007-07-26
-# Committed-By: Robert Schwebel
-#
-# Description: 
-#
-# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=58664
-#
-# State:
-# 
-# not submitted to upstream
-#
-
----
- ltmain.sh |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: liboil-0.3.16/ltmain.sh
-===================================================================
---- liboil-0.3.16.orig/ltmain.sh
-+++ liboil-0.3.16/ltmain.sh
-@@ -5040,7 +5040,7 @@ func_mode_link ()
- 	  *)
- 	    if test "$installed" = no; then
- 	      notinst_deplibs="$notinst_deplibs $lib"
--	      need_relink=yes
-+	      #need_relink=yes
- 	    fi
- 	    ;;
- 	  esac
diff --git a/patches/liboil-0.3.16/generic/liboil-0.3.13-fix-configure.diff b/patches/liboil-0.3.16/generic/liboil-0.3.13-fix-configure.diff
new file mode 100644
index 000000000..f04595b50
--- /dev/null
+++ b/patches/liboil-0.3.16/generic/liboil-0.3.13-fix-configure.diff
@@ -0,0 +1,32 @@
+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/generic/liboil-0.3.15-autoreconf.diff.bz2 b/patches/liboil-0.3.16/generic/liboil-0.3.15-autoreconf.diff.bz2
deleted file mode 100644
index ca9573cfb..000000000
--- a/patches/liboil-0.3.16/generic/liboil-0.3.15-autoreconf.diff.bz2
+++ /dev/null
diff --git a/patches/liboil-0.3.16/generic/series b/patches/liboil-0.3.16/generic/series
index b0ea5824d..49c69a04d 100644
--- a/patches/liboil-0.3.16/generic/series
+++ b/patches/liboil-0.3.16/generic/series
@@ -1,4 +1,2 @@
-liboil-0.3.12-ltmain_sh.diff
 liboil-0.3.13-fix-configure.ac.diff
-#liboil-0.3.15-autoreconf.diff.bz2
-
+liboil-0.3.13-fix-configure.diff