From 97a79b54e96836df2521e8a727f4fb78bdad32d8 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: May 15 2018 19:51:05 +0000 Subject: vars/build.vars:minipix: remove unnecessary dependencies, pt. II. --- diff --git a/vars/build.vars b/vars/build.vars index 42aa77d..b467fb6 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1250,28 +1250,23 @@ MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs"; MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs"; MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; MINIPIX_PACKAGES=" -bzip2_minipix gzip_minipix xz_minipix -bash_minipix coreutils_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix grep_minipix less_minipix nano_minipix patch_minipix sed_minipix tar_minipix vim_minipix wget_minipix which_minipix +bash_minipix bzip2_minipix coreutils_minipix dash_minipix +diffutils_minipix findutils_minipix gawk_minipix grep_minipix +gzip_minipix less_minipix nano_minipix patch_minipix sed_minipix +tar_minipix vim_minipix wget_minipix which_minipix xz_minipix mintty_minipix ntctty_minipix perk_minipix ptycon_minipix"; -MINIPIX_PARALLELISE=0; +MINIPIX_PARALLELISE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; # -# Dependencies -: ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2}; -: ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"}; -: ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"}; -: ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"}; -: ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip}; -: ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; -: ${PKG_GZIP_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="}; -: ${PKG_XZ_MINIPIX_INHERIT_FROM:=xz}; - -# # 3rd party packages : ${PKG_BASH_MINIPIX_INHERIT_FROM:=bash}; : ${PKG_BASH_MINIPIX_BUILD_STEPS_DISABLE:=install_make}; : ${PKG_BASH_MINIPIX_INSTALL_FILES:="../obj/bash=bin/ ../obj/bashbug=bin/"}; +: ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2}; +: ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"}; +: ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"}; +: ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"}; : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils}; : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip}; @@ -1281,6 +1276,9 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_FINDUTILS_MINIPIX_INHERIT_FROM:=findutils}; : ${PKG_GAWK_MINIPIX_INHERIT_FROM:=gawk}; : ${PKG_GREP_MINIPIX_INHERIT_FROM:=grep}; +: ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip}; +: ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; +: ${PKG_GZIP_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="}; : ${PKG_LESS_MINIPIX_INHERIT_FROM:=less}; : ${PKG_NANO_MINIPIX_INHERIT_FROM:=nano}; : ${PKG_PATCH_MINIPIX_INHERIT_FROM:=patch}; @@ -1290,6 +1288,7 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_VIM_MINIPIX_INHERIT_FROM:=vim}; : ${PKG_WGET_MINIPIX_INHERIT_FROM:=wget}; : ${PKG_WHICH_MINIPIX_INHERIT_FROM:=which}; +: ${PKG_XZ_MINIPIX_INHERIT_FROM:=xz}; # # Midipix tools