diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2018-12-22 22:20:13 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-12-24 17:05:57 +0100 |
| commit | 666dd5dc01bf2b56cd2acf94dfdb9a8748792290 (patch) | |
| tree | ff82c7358d4ec1ff48dd5a71af210176164970f6 | |
| parent | 5b3afca7576887be509eb21950009851676a1acb (diff) | |
| download | upstream-666dd5dc01bf2b56cd2acf94dfdb9a8748792290.tar.gz upstream-666dd5dc01bf2b56cd2acf94dfdb9a8748792290.tar.bz2 upstream-666dd5dc01bf2b56cd2acf94dfdb9a8748792290.zip | |
tools/mtools: Update to 4.0.23
Update mtools to 4.0.23
Drop patch, workaround in upstream
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
| -rw-r--r-- | tools/mtools/Makefile | 6 | ||||
| -rw-r--r-- | tools/mtools/patches/100-compile_fix.patch | 19 |
2 files changed, 4 insertions, 21 deletions
diff --git a/tools/mtools/Makefile b/tools/mtools/Makefile index 074909c1dc..9f9b09a91b 100644 --- a/tools/mtools/Makefile +++ b/tools/mtools/Makefile @@ -7,16 +7,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtools -PKG_VERSION:=4.0.19 +PKG_VERSION:=4.0.23 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/$(PKG_NAME) -PKG_HASH:=1bc197199ea1c2c317f597879486eeb817f3199b526d94cc6841624768d910df +PKG_HASH:=f188db26751aeb5692a79b2380b440ecc05fd1848a52f869d7ca1193f2ef8ee3 HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +HOST_CONFIGURE_ARGS += --without-x + HOST_CONFIGURE_VARS += \ ac_cv_header_iconv_h=no diff --git a/tools/mtools/patches/100-compile_fix.patch b/tools/mtools/patches/100-compile_fix.patch deleted file mode 100644 index 698e156029..0000000000 --- a/tools/mtools/patches/100-compile_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -101,14 +101,8 @@ 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 --/* gcc 2.6.3 doesn't have "unused" */ /* mool */ --# define UNUSED(x) x __attribute__ ((unused));x --# define UNUSEDP __attribute__ ((unused)) --# else --# define UNUSED(x) x --# define UNUSEDP /* */ --# endif -+# define UNUSED(x) x -+# define UNUSEDP /* */ - # define NORETURN __attribute__ ((noreturn)) - #else - # define UNUSED(x) x |