mtools: fix 3.9.11 recipe to properly compile

Compilation was failing due a wrong command line param being passed to
GCC. This patch fixes it.

,----[ Failure ]
| cc1: error: unrecognized command line option "-m486"
`----

Besides the compilation error, mtools.patch is not necessary anymore
and not applicable to this version, thus droped.

diff --git a/packages/mtools/files/m486.patch b/packages/mtools/files/m486.patch
new file mode 100644 (file)
index 0000000..e630324
--- /dev/null
+++ b/packages/mtools/files/m486.patch
@@ -0,0 +1,48 @@
+#!/bin/sh -e
+## 07-m486.dpatch by Matthias Klose <doko@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: #474817: mtools: FTBFS: cc1: error: unrecognized command line option "-m486"
+
+if [ $# -lt 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+--- mtools-3.9.11.orig/configure.in
++++ mtools-3.9.11/configure.in
+@@ -249,7 +249,7 @@
+ objs=`echo $srcdir/*.c | sed 's/\.c$/.o/' `
+ if [ "X$GCC" = "Xyes" ] ; then
+     if [ "$host_cpu" = i486 ] ; then
+-          CFLAGS="$CFLAGS -m486"
++          CFLAGS="$CFLAGS"
+     fi
+     Wall=-Wall
+     if [ "$host_os3" = sunos ] ; then
+unchanged:
+--- mtools-3.9.11.orig/configure
++++ mtools-3.9.11/configure
+@@ -5905,7 +5905,7 @@
+ objs=`echo $srcdir/*.c | sed 's/\.c$/.o/' `
+ if [ "X$GCC" = "Xyes" ] ; then
+     if [ "$host_cpu" = i486 ] ; then
+-          CFLAGS="$CFLAGS -m486"
++          CFLAGS="$CFLAGS"
+     fi
+     Wall=-Wall
+     if [ "$host_os3" = sunos ] ; then

diff --git a/packages/mtools/files/mtools.patch b/packages/mtools/files/mtools.patch
deleted file mode 100644 (file)
index 2abf534..0000000
--- a/packages/mtools/files/mtools.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
-
----
- Makefile.in |   74 ++++++++++++++++++++++++++----------------------------------
- 1 file changed, 33 insertions(+), 41 deletions(-)
-
-Index: mtools-3.9.9/Makefile.in
-===================================================================
---- mtools-3.9.9.orig/Makefile.in      2007-10-12 11:18:46.000000000 +0100
-+++ mtools-3.9.9/Makefile.in   2007-10-12 11:28:14.000000000 +0100
-@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html
- 
- # Don't cd, to avoid breaking install-sh references.
- install-info: info
--      $(top_srcdir)/mkinstalldirs $(infodir)
-+      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
-       if test -f mtools.info; then \
-         for i in mtools.info*; do \
--          $(INSTALL_DATA) $$i $(infodir)/$$i; \
-+          $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
-         done; \
-       else \
-         for i in $(srcdir)/mtools.info*; do \
--          $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-+          $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
-         done; \
-       fi; \
--      if [ -n "$(INSTALL_INFO)" ] ; then \
--              if [ -f $(infodir)/dir.info ] ; then \
--                      $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
--              fi; \
--              if [ -f $(infodir)/dir ] ; then \
--                      $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
--              fi; \
--      fi
- 
- uninstall-info:
-       cd $(infodir) && rm -f mtools.info*
- 
--install:      $(bindir)/mtools @BINFLOPPYD@ install-man install-links \
--              $(bindir)/mkmanifest install-scripts install-info
-+install:      ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \
-+              ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info
- 
- uninstall:    uninstall-bin uninstall-man uninstall-links \
-               uninstall-scripts
-@@ -228,52 +220,52 @@ distclean: clean texclean
- maintainer-clean: distclean
- 
- 
--$(bindir)/floppyd: floppyd
--      $(top_srcdir)/mkinstalldirs $(bindir)
--      $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
-+${DESTDIR}$(bindir)/floppyd: floppyd
-+      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-+      $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
- 
--$(bindir)/floppyd_installtest: floppyd_installtest
--      $(top_srcdir)/mkinstalldirs $(bindir)
--      $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
-+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
-+      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-+      $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
- 
--$(bindir)/mtools: mtools
--      $(top_srcdir)/mkinstalldirs $(bindir)
--      $(INSTALL_PROGRAM) mtools $(bindir)/mtools
-+${DESTDIR}$(bindir)/mtools: mtools
-+      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-+      $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
- 
--$(bindir)/mkmanifest: mkmanifest
--      $(top_srcdir)/mkinstalldirs $(bindir)
--      $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
-+${DESTDIR}$(bindir)/mkmanifest: mkmanifest
-+      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-+      $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
- 
- #$(ETCDIR)/mtools: mtools.etc
- #     cp mtools.etc $(ETCDIR)/mtools
- 
--install-links: $(bindir)/mtools
-+install-links: ${DESTDIR}$(bindir)/mtools
-       @for j in $(LINKS); do \
--              rm -f $(bindir)/$$j ; \
--              $(LN_S) mtools $(bindir)/$$j ; \
--              echo $(bindir)/$$j ; \
-+              rm -f ${DESTDIR}$(bindir)/$$j ; \
-+              $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \
-+              echo ${DESTDIR}$(bindir)/$$j ; \
-       done
- 
- ## "z" is the older version of "gz"; the name is just *too* short
--install-scripts: $(bindir)/mtools
--      @$(top_srcdir)/mkinstalldirs $(bindir)
-+install-scripts: ${DESTDIR}$(bindir)/mtools
-+      @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-       @for j in $(SCRIPTS) ; do \
--              $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
--              echo $(bindir)/$$j ; \
-+              $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
-+              echo ${DESTDIR}$(bindir)/$$j ; \
-       done
--      rm -f $(bindir)/lz
--      $(LN_S) uz $(bindir)/lz
-+      rm -f ${DESTDIR}$(bindir)/lz
-+      $(LN_S) uz ${DESTDIR}$(bindir)/lz
- 
- install-man:
--      @$(top_srcdir)/mkinstalldirs $(MAN1DIR)
-+      @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR)
-       @for j in $(MAN1); do \
--              $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
--              echo $(MAN1DIR)/$$j ; \
-+              $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \
-+              echo ${DESTDIR}$(MAN1DIR)/$$j ; \
-       done
--      @$(top_srcdir)/mkinstalldirs $(MAN5DIR)
-+      @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR)
-       @for j in $(MAN5); do \
--              $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
--              echo $(MAN5DIR)/$$j ; \
-+              $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \
-+              echo ${DESTDIR}$(MAN5DIR)/$$j ; \
-       done
- 
- uninstall-bin:

diff --git a/packages/mtools/mtools_3.9.11.bb b/packages/mtools/mtools_3.9.11.bb
index eca9909..4d1822f 100644 (file)
--- a/packages/mtools/mtools_3.9.11.bb
+++ b/packages/mtools/mtools_3.9.11.bb
@@ -8,8 +8,8 @@ LICENSE="GPL"
 PR = "r4"
 
 SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
+       file://m486.patch;patch=1 \
        file://mtools-makeinfo.patch;patch=1 \
-       file://mtools.patch;patch=1 \
        file://no-x11.patch;patch=1"
 
 S = "${WORKDIR}/mtools-${PV}"