Initial commit
This commit is contained in:
@@ -0,0 +1,17 @@
|
||||
Undefine UNUSED macros with clang
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Index: mtools-4.0.18/sysincludes.h
|
||||
===================================================================
|
||||
--- mtools-4.0.18.orig/sysincludes.h
|
||||
+++ mtools-4.0.18/sysincludes.h
|
||||
@@ -101,7 +101,7 @@ typedef void *caddr_t;
|
||||
#if defined __GNUC__ && defined __STDC__
|
||||
/* gcc -traditional doesn't have PACKED, UNUSED and NORETURN */
|
||||
# define PACKED __attribute__ ((packed))
|
||||
-# if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3
|
||||
+# if (__GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3) && !defined(__clang__)
|
||||
/* gcc 2.6.3 doesn't have "unused" */ /* mool */
|
||||
# define UNUSED(x) x __attribute__ ((unused));x
|
||||
# define UNUSEDP __attribute__ ((unused))
|
||||
@@ -0,0 +1,32 @@
|
||||
From 2ef9b371a5cc44e730143e694d71665831fac216 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.
|
||||
|
||||
Upstream-Status: Inappropriate [native]
|
||||
|
||||
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
||||
|
||||
---
|
||||
config.c | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/config.c b/config.c
|
||||
index 2f6a297..3181ed7 100644
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -844,14 +844,6 @@ void read_config(void)
|
||||
memcpy(devices, const_devices,
|
||||
nr_const_devices*sizeof(struct device));
|
||||
|
||||
- (void) ((parse(CONF_FILE,1) |
|
||||
- parse(LOCAL_CONF_FILE,1) |
|
||||
- parse(SYS_CONF_FILE,1)) ||
|
||||
- (parse(OLD_CONF_FILE,1) |
|
||||
- parse(OLD_LOCAL_CONF_FILE,1)));
|
||||
- /* the old-name configuration files only get executed if none of the
|
||||
- * new-name config files were used */
|
||||
-
|
||||
homedir = get_homedir();
|
||||
if ( homedir ){
|
||||
strncpy(conf_file, homedir, MAXPATHLEN );
|
||||
@@ -0,0 +1,79 @@
|
||||
From 3cf56b36db78679273f61ba78fbbf7f3fab52f68 Mon Sep 17 00:00:00 2001
|
||||
From: Marcin Juszkiewicz <hrw@openedhand.com>
|
||||
Date: Fri, 8 Jun 2007 08:35:12 +0000
|
||||
Subject: [PATCH] mtools: imported from OE
|
||||
|
||||
Upstream-Status: Inappropriate [licensing]
|
||||
|
||||
---
|
||||
Makefile.in | 11 ++++++-----
|
||||
configure.in | 27 +++++++++++++++++++++++++++
|
||||
2 files changed, 33 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 616d59f..85b5b1d 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -26,10 +26,11 @@ USERCFLAGS =
|
||||
USERLDFLAGS =
|
||||
USERLDLIBS =
|
||||
|
||||
-MAKEINFO = makeinfo
|
||||
-TEXI2DVI = texi2dvi
|
||||
-TEXI2PDF = texi2pdf
|
||||
-TEXI2HTML = texi2html
|
||||
+MAKEINFO = @MAKEINFO@
|
||||
+TEXI2DVI = @TEXI2DVI@
|
||||
+TEXI2PDF = @TEXI2PDF@
|
||||
+TEXI2HTML = @TEXI2HTML@
|
||||
+DVI2PS = @DVI2PS@
|
||||
|
||||
|
||||
# do not edit below this line
|
||||
@@ -199,7 +200,7 @@ dvi: mtools.dvi
|
||||
|
||||
ps: mtools.ps
|
||||
%.ps: %.dvi
|
||||
- dvips -f < $< > $@
|
||||
+ $(DVI2PS) -f < $< > $@
|
||||
|
||||
pdf: mtools.pdf
|
||||
%.pdf: %.texi sysconfdir.texi
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 5ff75c1..c0f7440 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -35,6 +35,33 @@ AC_CANONICAL_SYSTEM
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
+AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, )
|
||||
+if test "x$MAKEINFO" = "x"; then
|
||||
+ MAKEINFO="@echo makeinfo missing; true"
|
||||
+fi
|
||||
+AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, )
|
||||
+if test "x$TEXI2DVI" = "x"; then
|
||||
+ TEXI2DVI="@echo texi2dvi missing; true"
|
||||
+fi
|
||||
+AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, )
|
||||
+if test "x$TEXI2PDF" = "x"; then
|
||||
+ TEXI2PDF="@echo texi2pdf missing; true"
|
||||
+fi
|
||||
+AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, )
|
||||
+if test "x$TEXI2HTML" = "x"; then
|
||||
+ TEXI2HTML="@echo texi2html missing; true"
|
||||
+fi
|
||||
+AC_CHECK_PROG(DVI2PS, dvi2ps, dvi2ps, )
|
||||
+if test "x$DVI2PS" = "x"; then
|
||||
+ DVI2PS="@echo dvi2ps missing; true"
|
||||
+fi
|
||||
+
|
||||
+AC_SUBST(MAKEINFO)
|
||||
+AC_SUBST(TEXI2DVI)
|
||||
+AC_SUBST(TEXI2PDF)
|
||||
+AC_SUBST(TEXI2HTML)
|
||||
+AC_SUBST(DVI2PS)
|
||||
+
|
||||
dnl Check for configuration options
|
||||
dnl Enable OS/2 extended density format disks
|
||||
AC_ARG_ENABLE(xdf,
|
||||
@@ -0,0 +1,49 @@
|
||||
SUMMARY = "Utilities to access MS-DOS disks without mounting them"
|
||||
DESCRIPTION = "Mtools is a collection of utilities to access MS-DOS disks from GNU and Unix without mounting them."
|
||||
HOMEPAGE = "http://www.gnu.org/software/mtools/"
|
||||
SECTION = "optional"
|
||||
LICENSE = "GPL-3.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
DEPENDS += "virtual/libiconv"
|
||||
|
||||
RDEPENDS:${PN}:libc-glibc = "glibc-gconv-ibm850"
|
||||
RRECOMMENDS:${PN}:libc-glibc = "\
|
||||
glibc-gconv-ibm437 \
|
||||
glibc-gconv-ibm737 \
|
||||
glibc-gconv-ibm775 \
|
||||
glibc-gconv-ibm851 \
|
||||
glibc-gconv-ibm852 \
|
||||
glibc-gconv-ibm855 \
|
||||
glibc-gconv-ibm857 \
|
||||
glibc-gconv-ibm860 \
|
||||
glibc-gconv-ibm861 \
|
||||
glibc-gconv-ibm862 \
|
||||
glibc-gconv-ibm863 \
|
||||
glibc-gconv-ibm865 \
|
||||
glibc-gconv-ibm866 \
|
||||
glibc-gconv-ibm869 \
|
||||
"
|
||||
SRC_URI[sha256sum] = "541e179665dc4e272b9602f2074243591a157da89cc47064da8c5829dbd2b339"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \
|
||||
file://mtools-makeinfo.patch \
|
||||
file://clang_UNUSED.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = " file://disable-hardcoded-configs.patch"
|
||||
|
||||
inherit autotools texinfo
|
||||
|
||||
EXTRA_OECONF = "--without-x"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[libbsd] = "ac_cv_lib_bsd_main=yes,ac_cv_lib_bsd_main=no,libbsd"
|
||||
|
||||
do_install:prepend () {
|
||||
# Create bindir to fix parallel installation issues
|
||||
mkdir -p ${D}/${bindir}
|
||||
mkdir -p ${D}/${datadir}
|
||||
}
|
||||
Reference in New Issue
Block a user