From 9b5ad38f153bcca6a6d880cd5455cc19bd1873f9 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Feb 09 2020 14:57:09 +0000 Subject: vars/build.vars:libz_host: moved into host_tools. --- diff --git a/vars/build.vars b/vars/build.vars index 74f5cfe..613d05c 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -152,7 +152,7 @@ HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}"; HOST_TOOLS_MAKEFLAGS_INSTALL="PREFIX= prefix="; HOST_TOOLS_PACKAGES=" slibtool_host mdso_host perk_host pkgconf_host m4_host autoconf_host -automake_host libtool_host bison_host flex_host"; +automake_host libtool_host bison_host flex_host libz_host"; HOST_TOOLS_PREFIX="${PREFIX}"; : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"}; : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--prefix=}; @@ -185,6 +185,10 @@ HOST_TOOLS_PREFIX="${PREFIX}"; : ${PKG_FLEX_HOST_SHA256SUM:=68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa}; : ${PKG_FLEX_HOST_VERSION:=2.6.3}; : ${PKG_FLEX_HOST_URL:=https://github.com/westes/flex/releases/download/v${PKG_FLEX_HOST_VERSION}/flex-${PKG_FLEX_HOST_VERSION}.tar.gz}; +: ${PKG_LIBZ_HOST_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b}; +: ${PKG_LIBZ_HOST_VERSION:=1.2.8.2015.12.26}; +: ${PKG_LIBZ_HOST_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_HOST_VERSION}.tar.gz}; +: ${PKG_LIBZ_HOST_CONFIGURE_ARGS:="--enable-shared"}; # # Build group host_deps @@ -193,7 +197,7 @@ HOST_DEPS_BUILD_TYPE="host"; HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}"; HOST_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix="; HOST_DEPS_PACKAGES=" -bmake_host bzip2_host file_host install_strip_host libz_host mpackage_host sqlite3_host texinfo_host"; +bmake_host bzip2_host file_host install_strip_host mpackage_host sqlite3_host texinfo_host"; HOST_DEPS_PARALLELISE=1; HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"}; @@ -208,10 +212,6 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_FILE_HOST_VERSION:=5.32}; : ${PKG_FILE_HOST_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz}; : ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1}; -: ${PKG_LIBZ_HOST_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b}; -: ${PKG_LIBZ_HOST_VERSION:=1.2.8.2015.12.26}; -: ${PKG_LIBZ_HOST_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_HOST_VERSION}.tar.gz}; -: ${PKG_LIBZ_HOST_CONFIGURE_ARGS:="--enable-shared"}; : ${PKG_MPACKAGE_HOST_URLS_GIT:=mpackage=${DEFAULT_GITROOT}/mpackage}; : ${PKG_MPACKAGE_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"}; : ${PKG_MPACKAGE_HOST_IN_TREE:=1};