vars/build.vars:host_packages_deps: adds libzip_host (via midipix.)

vars/libzip{,_host}.vars: cleanup, adds pkg_libzip_host_configure().

3 files changed, 56 insertions, 25 deletions

diff --git a/vars/build.vars b/vars/build.vars
index b89acac9..108981d0 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -495,15 +495,18 @@ HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-pr
 HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
 HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_PACKAGES_DEPS_PACKAGES="
-clzip_host cmake_host llvm_host clang_host libffi_host expat_host ncursesw_host
-python2_host glib_host dbus_host dbus_glib_host gperf_host infounzip_host
-infozip_host intltool_host xz_host python3_host ruby_host tzdb_host";
+clzip_host libzip_host cmake_host llvm_host clang_host libffi_host expat_host
+ncursesw_host python2_host glib_host dbus_host dbus_glib_host gperf_host
+infounzip_host infozip_host intltool_host xz_host python3_host ruby_host tzdb_host";
 HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CLZIP_HOST_SHA256SUM:=d9d51212afa80371dc2546d278ef8ebbb3cd57c06fdd761b7b204497586d24c0};
 : ${PKG_CLZIP_HOST_VERSION:=1.11};
 : ${PKG_CLZIP_HOST_URL:=http://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_HOST_VERSION}.tar.gz};
 : ${PKG_CLZIP_HOST_IN_TREE:=1};
 : ${PKG_CLZIP_HOST_INSTALL_FILES:="@clzip=bin/lzip"};
+: ${PKG_LIBZIP_HOST_SHA256SUM:=b3de4d4bd49a01e0cab3507fc163f88e1651695b6b9cb25ad174dbe319d4a3b4};
+: ${PKG_LIBZIP_HOST_VERSION:=1.5.2};
+: ${PKG_LIBZIP_HOST_URL:=https://libzip.org/download/libzip-${PKG_LIBZIP_HOST_VERSION}.tar.xz};
 : ${PKG_CMAKE_HOST_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0};
 : ${PKG_CMAKE_HOST_VERSION:=3.7.2};
 : ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz};
diff --git a/vars/libzip.vars b/vars/libzip.vars
index 4e589fcb..c2c659fb 100644
--- a/vars/libzip.vars
+++ b/vars/libzip.vars
@@ -3,25 +3,52 @@
 #
 
 pkg_libzip_configure() {
-        rm -f config.cache;
-        env     CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"            \
-                PREFIX="" LDFLAGS="-lbz2"                                       \
-	cmake   -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER                       \
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY                        \
-		-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"                            \
-		-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"                    \
-		-DCMAKE_SYSTEM_NAME="Midipix"                                   \
-		-DCMAKE_BUILD_TYPE="Debug"                                      \
-		-DCMAKE_INSTALL_PREFIX=                                         \
-		-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"                    \
-		-DENABLE_GNUTLS=:BOOL=OFF                                       \
-		-DENABLE_MBEDTLS=:BOOL=OFF                                      \
-                -DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"                      \
-		-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.lib.a"                   \
-		-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a"              \
-		-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"                     \
-		-DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a"          \
-                -DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a"    \
-		-DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts"                      \
-               "../libzip-${PKG_VERSION}";
-}
+	local _build_type="";
+	case "${BUILD}" in
+	debug)		_build_type="Debug"; ;;
+	release) 	_build_type="Release"; ;;
+	*)		exit 1; ;;
+	esac;
+	rm -f config.cache;
+	env	CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"		\
+		PREFIX="" LDFLAGS="-lbz2"					\
+	cmake	-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+		-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.lib.a"		\
+		-DCMAKE_AR="${PREFIX}/bin/${PKG_AR}"				\
+		-DCMAKE_BUILD_TYPE="${_build_type}"				\
+		-DCMAKE_C_COMPILER="${PREFIX}/bin/${PKG_CC}"			\
+		-DCMAKE_C_STANDARD_LIBRARIES="-lbz2 -lfts"			\
+		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY			\
+		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER			\
+		-DCMAKE_INSTALL_PREFIX=						\
+		-DCMAKE_RANLIB="${PREFIX}/bin/${PKG_RANLIB}"			\
+		-DCMAKE_SYSTEM_NAME="Midipix"					\
+		-DENABLE_GNUTLS=:BOOL=OFF					\
+		-DENABLE_MBEDTLS=:BOOL=OFF					\
+		-DOPENSSL_CRYPTO_LIBRARY="${PKG_PREFIX}/lib/libcrypto.lib.a"	\
+		-DOPENSSL_SSL_LIBRARY="${PKG_PREFIX}/lib/libssl.lib.a"		\
+		-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+		-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.lib.a"			\
+		"../libzip-${PKG_VERSION}";
+};
+
+pkg_libzip_host_configure() {
+	local _build_type="";
+	case "${BUILD}" in
+	debug)		_build_type="Debug"; ;;
+	release) 	_build_type="Release"; ;;
+	*)		exit 1; ;;
+	esac;
+	rm -f config.cache;
+	env	PREFIX="" LDFLAGS="-lbz2"					\
+	cmake	-DCMAKE_BUILD_TYPE="${_build_type}"				\
+		-DCMAKE_C_STANDARD_LIBRARIES="-lbz2"				\
+		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY			\
+		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER			\
+		-DCMAKE_INSTALL_PREFIX=						\
+		-DENABLE_GNUTLS=:BOOL=OFF					\
+		-DENABLE_MBEDTLS=:BOOL=OFF					\
+		"../libzip-${PKG_VERSION}";
+};
+
+# vim:filetype=sh
diff --git a/vars/libzip_host.vars b/vars/libzip_host.vars
new file mode 120000
index 00000000..8582365b
--- /dev/null
+++ b/vars/libzip_host.vars
@@ -0,0 +1 @@
+libzip.vars
\ No newline at end of file