mtools: update 4.0.32 -> 4.0.34

Drop no-x11.gplv3.patch (the libraries are now
dynamically enabled from configure.in).

(From OE-Core rev: b9b628b55b5c2982145a333686338e757827f499)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-07-30 13:45:00 +02:00
committed by Richard Purdie
parent 332cadc059
commit 5322c500c2
3 changed files with 3 additions and 22 deletions

View File

@@ -1,4 +1,4 @@
From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001
From bd2ec723326b6d57350da73b444dd43e923011e8 Mon Sep 17 00:00:00 2001
From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Tue, 13 Jun 2017 14:55:52 +0300
Subject: [PATCH] Disabled reading host configs.
@@ -12,7 +12,7 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
1 file changed, 8 deletions(-)
diff --git a/config.c b/config.c
index bb13682..9186c77 100644
index 173eae0..0654cc1 100644
--- a/config.c
+++ b/config.c
@@ -836,14 +836,6 @@ void read_config(void)

View File

@@ -1,18 +0,0 @@
Disable building with X11 support.
Upstream-Status: Inappropriate [disable feature]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
diff -urN mtools-4.0.15.orig//Makefile.in mtools-4.0.15//Makefile.in
--- mtools-4.0.15.orig//Makefile.in 2010-10-17 08:41:09.000000000 -0700
+++ mtools-4.0.15//Makefile.in 2010-11-23 13:59:49.258258374 -0800
@@ -146,7 +146,7 @@
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) -lXau -lX11 $(LIBS)
+X_LDFLAGS = $(X_EXTRA_LIBS) $(X_LIBS) $(LIBS)
X_CCFLAGS = $(X_CFLAGS) $(CFLAGS)
all: mtools $(LINKS) mkmanifest @FLOPPYD@ mtools.1 mtools.5

View File

@@ -24,11 +24,10 @@ RRECOMMENDS:${PN}:libc-glibc = "\
glibc-gconv-ibm866 \
glibc-gconv-ibm869 \
"
SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89"
SRC_URI[sha256sum] = "ada543eb1b0ffe5440d4ee42634309ea1e286d7ebb80c99ba50db5cb2c360cab"
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
file://mtools-makeinfo.patch \
file://no-x11.gplv3.patch \
file://clang_UNUSED.patch \
"