summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/mtools/files/no-x11.patch19
-rw-r--r--packages/mtools/mtools-native_3.9.9.bb1
-rw-r--r--packages/mtools/mtools_3.9.9.bb9
3 files changed, 25 insertions, 4 deletions
diff --git a/packages/mtools/files/no-x11.patch b/packages/mtools/files/no-x11.patch
new file mode 100644
index 0000000000..300f43f000
--- /dev/null
+++ b/packages/mtools/files/no-x11.patch
@@ -0,0 +1,19 @@
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- mtools-3.9.9.orig/Makefile.in
++++ mtools-3.9.9/Makefile.in
+@@ -128,11 +128,11 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ CFLAGS = $(CPPFLAGS) $(DEFS) $(MYCFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
+ CXXFLAGS = $(CPPFLAGS) $(DEFS) $(MYCXXFLAGS) -I. @extraincludedir@ -I@srcdir@ $(USERCFLAGS)
+ LINK = $(CC) $(LDFLAGS) $(USERLDFLAGS) @extralibdir@
+ ALLLIBS = $(USERLDLIBS) $(MACHDEPLIBS) $(SHLIB) $(LIBS)
+-X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lXau -lX11 $(LIBS)
++X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(X_PRE_LIBS) $(LIBS)
+ X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
+
+ all: mtools $(LINKS) mkmanifest @FLOPPYD@
+
+ %.o: %.c
diff --git a/packages/mtools/mtools-native_3.9.9.bb b/packages/mtools/mtools-native_3.9.9.bb
index 16a0c37f7c..c82f7404eb 100644
--- a/packages/mtools/mtools-native_3.9.9.bb
+++ b/packages/mtools/mtools-native_3.9.9.bb
@@ -3,6 +3,5 @@
# Released under the MIT license (see packages/COPYING)
require mtools_${PV}.bb
-S="${WORKDIR}/mtools-${PV}"
inherit autotools native
diff --git a/packages/mtools/mtools_3.9.9.bb b/packages/mtools/mtools_3.9.9.bb
index 7c872a144f..eca9909e8f 100644
--- a/packages/mtools/mtools_3.9.9.bb
+++ b/packages/mtools/mtools_3.9.9.bb
@@ -5,12 +5,15 @@
DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
HOMEPAGE="http://mtools.linux.lu"
LICENSE="GPL"
-PR = "r2"
+PR = "r4"
SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
file://mtools-makeinfo.patch;patch=1 \
- file://mtools.patch;patch=1"
+ file://mtools.patch;patch=1 \
+ file://no-x11.patch;patch=1"
-#DEPENDS = "tetex-native"
+S = "${WORKDIR}/mtools-${PV}"
inherit autotools
+
+EXTRA_OECONF = "--without-x"