diff options
author | Mark Brand <mabrand@mabrand.nl> | 2011-09-03 17:50:12 (GMT) |
---|---|---|
committer | Mark Brand <mabrand@mabrand.nl> | 2011-09-03 17:50:12 (GMT) |
commit | fe7b3d223159f9dda17f028319b6834bf0cbe63c (patch) | |
tree | 047932c9cb86e4280fed4706dc039a5ce1c8f310 | |
parent | 6050d64bce6a63fbce40d039f0de61372ad60e12 (diff) | |
download | mxe-fe7b3d223159f9dda17f028319b6834bf0cbe63c.zip mxe-fe7b3d223159f9dda17f028319b6834bf0cbe63c.tar.gz mxe-fe7b3d223159f9dda17f028319b6834bf0cbe63c.tar.bz2 |
update package libarchive
-rw-r--r-- | src/libarchive-1-fixes.patch | 26 | ||||
-rw-r--r-- | src/libarchive.mk | 4 |
2 files changed, 2 insertions, 28 deletions
diff --git a/src/libarchive-1-fixes.patch b/src/libarchive-1-fixes.patch deleted file mode 100644 index 630510e..0000000 --- a/src/libarchive-1-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Patch taken from -http://code.google.com/p/libarchive/source/detail?r=3649 - -mingwrt 3.20 provides ssize_t and defines _SSIZE_T_. This patch -allows libarchive to use this ssize_t instead of defining its -own which causes build failure. Applies to libarchive 2.8.4. - -diff --git a/libarchive/archive.h b/libarchive/archive.h -index 5ca28eb..f33a8ed 100644 ---- a/libarchive/archive.h -+++ b/libarchive/archive.h -@@ -52,7 +52,7 @@ - /* These should match the types used in 'struct stat' */ - #if defined(_WIN32) && !defined(__CYGWIN__) - #define __LA_INT64_T __int64 --# if defined(_SSIZE_T_DEFINED) -+# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_) - # define __LA_SSIZE_T ssize_t - # elif defined(_WIN64) - # define __LA_SSIZE_T __int64 --- -1.7.6 - diff --git a/src/libarchive.mk b/src/libarchive.mk index 10dcc21..d5c31cb 100644 --- a/src/libarchive.mk +++ b/src/libarchive.mk @@ -4,8 +4,8 @@ # Libarchive PKG := libarchive $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.4 -$(PKG)_CHECKSUM := b9cc3bbd20bd71f996be9ec738f19fda8653f7af +$(PKG)_VERSION := 2.8.5 +$(PKG)_CHECKSUM := e48a3b50de84b1d747f5af9ca5ba90eb6d3a4a78 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://code.google.com/p/libarchive/ |