summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHopper262 <hopper@whpress.com>2019-03-23 23:52:36 (GMT)
committerTony Theodore <tonyt@logyst.com>2019-03-30 01:44:31 (GMT)
commit96a96e2f683792853513b6baea436f21f4992f10 (patch)
tree93f7fbcdb7c23d2e4ce849669a2a3b4c9e054e6e
parent5fc2cfc5c176db98c90fcd775811009c71e7d482 (diff)
downloadmxe-96a96e2f683792853513b6baea436f21f4992f10.zip
mxe-96a96e2f683792853513b6baea436f21f4992f10.tar.gz
mxe-96a96e2f683792853513b6baea436f21f4992f10.tar.bz2
Enable mmap for zziplib
-rw-r--r--src/zziplib-2-prefer-win32-mmap.patch23
-rw-r--r--src/zziplib.mk1
2 files changed, 23 insertions, 1 deletions
diff --git a/src/zziplib-2-prefer-win32-mmap.patch b/src/zziplib-2-prefer-win32-mmap.patch
new file mode 100644
index 0000000..3290ba0
--- /dev/null
+++ b/src/zziplib-2-prefer-win32-mmap.patch
@@ -0,0 +1,23 @@
+This file is part of MXE. See LICENSE.md for licensing information.
+
+Contains ad hoc patches for cross building.
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Hopper262 <hopper@whpress.com>
+Date: Sat, 23 Mar 2019 19:50:51 -0400
+Subject: [PATCH 1/1] Prefer win32 mmap
+
+
+diff --git a/zzip/__mmap.h b/zzip/__mmap.h
+index 1111111..2222222 100644
+--- a/zzip/__mmap.h
++++ b/zzip/__mmap.h
+@@ -18,7 +18,7 @@
+ */
+
+ #ifdef _USE_MMAP
+-#if defined ZZIP_HAVE_SYS_MMAN_H
++#if defined ZZIP_HAVE_SYS_MMAN_H && !defined WIN32
+ #include <sys/mman.h>
+ #define USE_POSIX_MMAP 1
+ #elif defined ZZIP_HAVE_WINBASE_H || defined WIN32
diff --git a/src/zziplib.mk b/src/zziplib.mk
index d58614e..29e7153 100644
--- a/src/zziplib.mk
+++ b/src/zziplib.mk
@@ -25,7 +25,6 @@ define $(PKG)_BUILD
# mman-win32 is only a partial implementation
cd '$(1)' && ./configure \
$(MXE_CONFIGURE_OPTS) \
- --disable-mmap \
CFLAGS="-O -ggdb" \
PKG_CONFIG='$(TARGET)-pkg-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= LDFLAGS="-no-undefined"