vars/build.vars: build infozip{_host,} via <https://github.com/Redfoxmoon3/infozip.git@master> (via Redfoxmoon.)

patches/zip30.local.patch: removed.

2 files changed, 9 insertions, 25 deletions

diff --git a/patches/zip30.local.patch b/patches/zip30.local.patch
deleted file mode 100644
index 0c37bcf9..00000000
--- a/patches/zip30.local.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru zip30.orig/unix/Makefile zip30/unix/Makefile
---- zip30.orig/unix/Makefile	2008-05-07 08:33:56.000000000 +0200
-+++ zip30/unix/Makefile	2016-10-17 01:03:49.734470317 +0200
-@@ -196,6 +196,12 @@
- # NO_UNICODE_SUPPORT    - do not enable Unicode support even if available.
- # NO_BZIP2_SUPPORT      - do not compile in bzip2 code even if available.
- 
-+# Midipix target
-+midipix:
-+	$(MAKE) $(MAKEF) zips LDFLAGS1="" CC="x86_64-nt64-midipix-gcc" CPP="x86_64-nt64-midipix-gcc -E" \
-+	 CFLAGS="-g3 -O0 -DUNIX -I. -DHAVE_TERMIOS_H -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
-+	 -DHAVE_DIRENT_H -DUIDGID_NOT_16BIT" OBJA="" OCRCU8="crc32_.o " OCRCTB="" LN="ln -s" LFLAGS2=""
-+
- #               Generic targets:
- 
- generic: flags
diff --git a/vars/build.vars b/vars/build.vars
index b7864b28..2f09757e 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -90,7 +90,7 @@ INVARIANTS_PACKAGES="chainport";
 HOST_TOOLCHAIN_BUILD_TYPE="host";
 HOST_TOOLCHAIN_CFLAGS_CONFIGURE="${HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}";
 HOST_TOOLCHAIN_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
-HOST_TOOLCHAIN_PACKAGES="slibtool_host perk_host mdso_host binutils_host binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full file_host install_strip_host psxtypes_host ldso_host pkgconf_host";
+HOST_TOOLCHAIN_PACKAGES="slibtool_host perk_host mdso_host binutils_host binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full file_host infozip_host install_strip_host psxtypes_host ldso_host pkgconf_host";
 HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=};
@@ -134,6 +134,10 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_FILE_HOST_VERSION:=5.32};
 : ${PKG_FILE_HOST_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz};
 : ${PKG_FILE_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX}"};
+: ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master};
+: ${PKG_INFOZIP_HOST_MAKEFLAGS_INSTALL_EXTRA:=DESTDIR=${PREFIX}};
+: ${PKG_INFOZIP_HOST_BUILD_DIR:=infozip-host};
+: ${PKG_INFOZIP_HOST_SUBDIR:=infozip-host};
 : ${PKG_INSTALL_STRIP_HOST_BUILD_STEPS:="setup_env:always install:main"};
 : ${PKG_INSTALL_STRIP_HOST_URL:=none};
 : ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${GITROOT}/psxtypes};
@@ -796,14 +800,10 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_INFOUNZIP_MAKEFLAGS_BUILD_EXTRA:="-f unix/Makefile midipix"};
 : ${PKG_INFOUNZIP_NO_MAKE_INSTALL:=1};
 : ${PKG_INFOUNZIP_SUBDIR:=${PKG_INFOUNZIP_BUILD_DIR}};
-: ${PKG_INFOZIP_SHA256SUM:=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369};
-: ${PKG_INFOZIP_VERSION:=30};
-: ${PKG_INFOZIP_URL:=ftp://ftp.info-zip.org/pub/infozip/src/zip${PKG_INFOZIP_VERSION}.tgz};
-: ${PKG_INFOZIP_BUILD_DIR:=zip${PKG_INFOZIP_VERSION}};
-: ${PKG_INFOZIP_INSTALL_FILES:="zip=bin/ zipcloak=bin/ zipnote=bin/ zipsplit=bin/"};
-: ${PKG_INFOZIP_MAKEFLAGS_BUILD_EXTRA:="-f unix/Makefile midipix"};
-: ${PKG_INFOZIP_NO_MAKE_INSTALL:=1};
-: ${PKG_INFOZIP_SUBDIR:=${PKG_INFOZIP_BUILD_DIR}};
+: ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
+: ${PKG_INFOZIP_MAKEFLAGS_INSTALL_EXTRA:=DESTDIR=${PREFIX_NATIVE}};
+: ${PKG_INFOZIP_BUILD_DIR:=infozip};
+: ${PKG_INFOZIP_SUBDIR:=infozip};
 : ${PKG_IRSSI_SHA256SUM:=48ff359f8abb706e729cbb8bc7bd93863e4e785f9a05d993a398310ac74beea8};
 : ${PKG_IRSSI_VERSION:=1.0.4};
 : ${PKG_IRSSI_URL:=https://github.com/irssi/irssi/releases/download/${PKG_IRSSI_VERSION}/irssi-${PKG_IRSSI_VERSION}.tar.gz};