new package: zip

pull/2067/merge
Mark Brand 6 years ago committed by Tony Theodore
parent bee074c104
commit 06b4b01cf6

@ -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);

@ -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
Loading…
Cancel
Save