From 0ddc1e323bdcfb9c3bc544327e480da8e4a74a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sun, 3 Dec 2017 19:46:36 +0000 Subject: vars/build.vars:*_minipix: fixed. patches/{bash,bzip2,coreutils}_minipix-*.patch: linked. subr/ex_pkg_env.subr, var/env.vars: replaces flavours mechanism w/ non-recursive per-package ${PKG_INHERIT_FROM}. subr/pkg_configure_patch.subr: remove ${PKG_NAME_PARENT} bits. vars/{bash,xz}_minipix.vars: added/linked. --- vars/build.vars | 75 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 34 deletions(-) (limited to 'vars/build.vars') diff --git a/vars/build.vars b/vars/build.vars index 93dfcc60..442b9cc6 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1043,41 +1043,48 @@ DIST_MINIPIX_INSTALL_FILES_DESTDIR_EXTRA="@bin=lib @bin=libexec @bin=share"; DIST_MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; DIST_MINIPIX_PACKAGES=" -bzip2_flavour_minipix gzip_flavour_minipix xz_flavour_minipix -bash_flavour_minipix coreutils_flavour_minipix tar_flavour_minipix -ntctty_flavour_minipix ptycon_flavour_minipix"; +bzip2_minipix gzip_minipix xz_minipix bash_minipix +coreutils_minipix tar_minipix ntctty_minipix ptycon_minipix"; DIST_MINIPIX_PREFIX="${PREFIX_MINIPIX}"; -: ${PKG_BZIP2_FLAVOUR_MINIPIX_BUILD_STEPS_DISABLE:="${PKG_BZIP2_BUILD_STEPS_DISABLE:+${PKG_BZIP2_BUILD_STEPS_DISABLE} }install_make"}; -: ${PKG_BZIP2_FLAVOUR_MINIPIX_INSTALL_FILES:="bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"}; -: ${PKG_BZIP2_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="--sysroot=${PREFIX_NATIVE} -mvrfs"}; -: ${PKG_BZIP2_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"}; -: ${PKG_BZIP2_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}}; -: ${PKG_GZIP_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; -: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-mvrfs"}; -: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-mvrfs"}; -: ${PKG_GZIP_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="}; -: ${PKG_XZ_FLAVOUR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; -: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD:="LIBTOOLFLAGS=-all-static"}; -: ${PKG_XZ_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}}; -: ${PKG_BASH_FLAVOUR_MINIPIX_BUILD_STEPS_DISABLE:=install_make}; -: ${PKG_BASH_FLAVOUR_MINIPIX_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"}; -: ${PKG_BASH_FLAVOUR_MINIPIX_INSTALL_FILES:="bash=bin/ bashbug=bin/"}; -: ${PKG_BASH_FLAVOUR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; -: ${PKG_COREUTILS_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; -: ${PKG_COREUTILS_FLAVOUR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; -: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"}; -: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip}; -: ${PKG_TAR_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-mvrfs"}; -: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"}; -: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"}; -: ${PKG_NTCTTY_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; -: ${PKG_NTCTTY_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; -: ${PKG_NTCTTY_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app}; -: ${PKG_NTCTTY_FLAVOUR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; -: ${PKG_PTYCON_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; -: ${PKG_PTYCON_FLAVOUR_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; -: ${PKG_PTYCON_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app}; -: ${PKG_PTYCON_FLAVOUR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; +: ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2}; +: ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="${PKG_BZIP2_BUILD_STEPS_DISABLE:+${PKG_BZIP2_BUILD_STEPS_DISABLE} }install_make"}; +: ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"}; +: ${PKG_BZIP2_MINIPIX_LDFLAGS_BUILD_EXTRA:="--sysroot=${PREFIX_NATIVE} -mvrfs"}; +: ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"}; +: ${PKG_BZIP2_MINIPIX_PREFIX:=${PREFIX_MINIPIX}}; +: ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip}; +: ${PKG_GZIP_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; +: ${PKG_GZIP_MINIPIX_LDFLAGS_BUILD_EXTRA:="-mvrfs"}; +: ${PKG_GZIP_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-mvrfs"}; +: ${PKG_GZIP_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:="OBJA="}; +: ${PKG_XZ_MINIPIX_INHERIT_FROM:=xz}; +: ${PKG_XZ_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; +: ${PKG_XZ_MINIPIX_MAKEFLAGS_BUILD:="LIBTOOLFLAGS=-all-static"}; +: ${PKG_XZ_MINIPIX_PREFIX:=${PREFIX_MINIPIX}}; +: ${PKG_BASH_MINIPIX_INHERIT_FROM:=bash}; +: ${PKG_BASH_MINIPIX_BUILD_STEPS_DISABLE:=install_make}; +: ${PKG_BASH_MINIPIX_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"}; +: ${PKG_BASH_MINIPIX_INSTALL_FILES:="bash=bin/ bashbug=bin/"}; +: ${PKG_BASH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; +: ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils}; +: ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS}; +: ${PKG_COREUTILS_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; +: ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"}; +: ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip}; +: ${PKG_TAR_MINIPIX_INHERIT_FROM:=tar}; +: ${PKG_TAR_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; +: ${PKG_TAR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"}; +: ${PKG_TAR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS"}; +: ${PKG_NTCTTY_MINIPIX_INHERIT_FROM:=ntctty}; +: ${PKG_NTCTTY_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; +: ${PKG_NTCTTY_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; +: ${PKG_NTCTTY_MINIPIX_INSTALL_TARGET:=install-static-app}; +: ${PKG_NTCTTY_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; +: ${PKG_PTYCON_MINIPIX_INHERIT_FROM:=ptycon}; +: ${PKG_PTYCON_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; +: ${PKG_PTYCON_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; +: ${PKG_PTYCON_MINIPIX_INSTALL_TARGET:=install-static-app}; +: ${PKG_PTYCON_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"}; # # Build target dist_target -- cgit v1.2.3