diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-01-22 14:24:01 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-01-22 14:24:01 +0000 |
| commit | 4c352f6080c9249aa3d38913e7d297c51279a0f0 (patch) | |
| tree | 1dadf5eefcee419bb971dfe167fafffe062b8293 | |
| parent | 1bd15efef1dfe0fff29a448fb719b5dfc2a0e861 (diff) | |
| download | midipix_build-4c352f6080c9249aa3d38913e7d297c51279a0f0.tar.bz2 midipix_build-4c352f6080c9249aa3d38913e7d297c51279a0f0.tar.xz | |
groups/231.native_packages_etc.group:minizip:${PKG_SUBDIR}: set to minizip-ng-${PKG_MINIZIP_VERSION}.
patches/minizip-2.10.4.local.patch: updated.
vars/minizip.vars: correctly reference ${PKG_SUBDIR}.
| -rw-r--r-- | groups/231.native_packages_etc.group | 2 | ||||
| -rw-r--r-- | patches/minizip-2.10.4.local.patch | 5 | ||||
| -rw-r--r-- | vars/minizip.vars | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 4db09267..f7be9222 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -239,7 +239,7 @@ zstd")"; : ${PKG_MINIZIP_SHA256SUM:=f4c8e7afdd45a093f69d7d338652996766d5473e63ad97a2c5cf89c0787773a0}; : ${PKG_MINIZIP_VERSION:=2.10.4}; : ${PKG_MINIZIP_URL:=https://github.com/nmoinvaz/minizip/archive/${PKG_MINIZIP_VERSION}.tar.gz}; -: ${PKG_MINIZIP_SUBDIR:=minizip-${PKG_MINIZIP_VERSION}}; +: ${PKG_MINIZIP_SUBDIR:=minizip-ng-${PKG_MINIZIP_VERSION}}; : ${PKG_MINTTY_DEPENDS:="w32api w32lib"}; : ${PKG_MINTTY_URLS_GIT:="mintty=https://github.com/midipix-ports/mintty.git@midipix bmintty=https://github.com/midipix-ports/bmintty.git@main"}; : ${PKG_MINTTY_CONFIGURE:=bmintty/configure}; diff --git a/patches/minizip-2.10.4.local.patch b/patches/minizip-2.10.4.local.patch index d1a2092b..43949215 100644 --- a/patches/minizip-2.10.4.local.patch +++ b/patches/minizip-2.10.4.local.patch @@ -1,6 +1,5 @@ -diff -ru minizip-2.10.4.orig/CMakeLists.txt minizip-2.10.4/CMakeLists.txt ---- minizip-2.10.4.orig/CMakeLists.txt 2020-12-07 01:32:18.000000000 +0100 -+++ minizip-2.10.4/CMakeLists.txt 2020-12-07 15:20:38.128398493 +0100 +--- minizip-ng-2.10.4/CMakeLists.txt.orig 2020-12-07 00:32:18.000000000 +0000 ++++ minizip-ng-2.10.4/CMakeLists.txt 2021-01-22 14:22:55.215576991 +0000 @@ -639,7 +639,6 @@ endif() diff --git a/vars/minizip.vars b/vars/minizip.vars index 4e2667e0..c6ac3f0f 100644 --- a/vars/minizip.vars +++ b/vars/minizip.vars @@ -23,7 +23,7 @@ pkg_minizip_configure() { -DMZ_LIBBSD=OFF \ -DBUILD_SHARED_LIBS=ON \ -DMZ_BUILD_TEST=ON \ - "../minizip-${PKG_VERSION}"; then + "../${PKG_SUBDIR}"; then return 1; fi; }; |