diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2018-02-27 15:24:40 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-03-12 04:11:47 (GMT) |
| commit | 06b4b01cf6a1229e55493e9bb6c6f7d0c3bfef91 (patch) | |
| tree | 27782ee15fb3c2a61f6723431d373d1ffe2ceb1d | |
| parent | bee074c1041e5006999991eee5c8301df1d28771 (diff) | |
| download | mxe-06b4b01cf6a1229e55493e9bb6c6f7d0c3bfef91.zip mxe-06b4b01cf6a1229e55493e9bb6c6f7d0c3bfef91.tar.gz mxe-06b4b01cf6a1229e55493e9bb6c6f7d0c3bfef91.tar.bz2 | |
new package: zip
| -rw-r--r-- | src/zip-1-fixes.patch | 44 | ||||
| -rw-r--r-- | src/zip.mk | 28 |
2 files changed, 72 insertions, 0 deletions
diff --git a/src/zip-1-fixes.patch b/src/zip-1-fixes.patch new file mode 100644 index 0000000..9dd15eb --- /dev/null +++ b/src/zip-1-fixes.patch @@ -0,0 +1,44 @@ +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: Mark Brand <mabrand@mabrand.nl> +Date: Tue, 27 Feb 2018 16:22:41 +0100 +Subject: [PATCH 1/1] MXE build fixes + + +diff --git a/win32/makefile.gcc b/win32/makefile.gcc +index 1111111..2222222 100644 +--- a/win32/makefile.gcc ++++ b/win32/makefile.gcc +@@ -150,10 +150,10 @@ zipcloak.exe: $(OBJC) + $(LD) $(LDFLAGS) $(OBJC) $(LIBS) + + zipnote.exe: $(OBJN) +- $(LD) $(LDFLAGS) $(OBJN) ++ $(LD) $(LDFLAGS) $(OBJN) $(LIBS) + + zipsplit.exe: $(OBJS) +- $(LD) $(LDFLAGS) $(OBJS) ++ $(LD) $(LDFLAGS) $(OBJS) $(LIBS) + + clean: + rm -f *.o $(ZIPS) +diff --git a/win32/osdep.h b/win32/osdep.h +index 1111111..2222222 100644 +--- a/win32/osdep.h ++++ b/win32/osdep.h +@@ -438,10 +438,10 @@ + #endif + + #ifdef _MBCS +-# if (!defined(__EMX__) && !defined(__MINGW32__) && !defined(__CYGWIN__)) ++//# if (!defined(__EMX__) && !defined(__MINGW32__) && !defined(__CYGWIN__)) + # include <stdlib.h> + # include <mbstring.h> +-# endif ++//# endif + # if (defined(__MINGW32__) && !defined(MB_CUR_MAX)) + # ifdef __MSVCRT__ + IZ_IMP extern int *__p___mb_cur_max(void); diff --git a/src/zip.mk b/src/zip.mk new file mode 100644 index 0000000..970ea8e --- /dev/null +++ b/src/zip.mk @@ -0,0 +1,28 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := zip +$(PKG)_WEBSITE := http://www.info-zip.org +$(PKG)_DESCR := Info-ZIP +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.0 +$(PKG)_CHECKSUM := f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 +$(PKG)_VERSIONF := $(shell echo $($(PKG)_VERSION) | tr -d .) +$(PKG)_SUBDIR := $(PKG)$($(PKG)_VERSIONF) +$(PKG)_FILE := $(PKG)$($(PKG)_VERSIONF).tar.gz +$(PKG)_URL := $(SOURCEFORGE_MIRROR)/project/infozip/Zip%203.x%20%28latest%29/$($(PKG)_VERSION)/$($(PKG)_FILE) + +$(PKG)_DEPS := cc zlib + +define $(PKG)_UPDATE + echo 'NOTE: automatic updates for zip are disabled.' >&2; + echo $(zip_VERSION) +endef + +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j '$(JOBS)' -f win32/makefile.gcc \ + CC=$(TARGET)-gcc \ + RC=$(TARGET)-windres \ + USEZLIB=1 + + $(INSTALL) '$(1)'/*.exe '$(PREFIX)'/$(TARGET)/bin +endef |