diff options
Diffstat (limited to 'vars')
| l--------- | vars/bash_minipix.vars | 1 | ||||
| -rw-r--r-- | vars/build.vars | 75 | ||||
| -rw-r--r-- | vars/env.vars | 4 | ||||
| -rw-r--r-- | vars/xz_minipix.vars (renamed from vars/xz_flavour_minipix.vars) | 2 |
4 files changed, 45 insertions, 37 deletions
diff --git a/vars/bash_minipix.vars b/vars/bash_minipix.vars new file mode 120000 index 00000000..f4e9402f --- /dev/null +++ b/vars/bash_minipix.vars @@ -0,0 +1 @@ +bash.vars
\ No newline at end of file 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 diff --git a/vars/env.vars b/vars/env.vars index 8d76b810..fcfc3cc8 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -9,8 +9,8 @@ DEFAULT_BUILD_VARS=" CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \ CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE \ CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA \ - DISABLED ENV_VARS_EXTRA FNAME INSTALL_FILES INSTALL_FILES_DESTDIR \ - INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET INSTALL_TARGET_EXTRA \ + DISABLED ENV_VARS_EXTRA FNAME INHERIT_FROM INSTALL_FILES INSTALL_FILES \ + DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET INSTALL_TARGET_EXTRA \ IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA \ LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME MAKEFLAGS_BUILD \ MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \ diff --git a/vars/xz_flavour_minipix.vars b/vars/xz_minipix.vars index 18820f1d..45b23772 100644 --- a/vars/xz_flavour_minipix.vars +++ b/vars/xz_minipix.vars @@ -2,7 +2,7 @@ # set -o errexit -o noglob are assumed. # -pkg_xz_flavour_minipix_install_make() { +pkg_xz_minipix_install_make() { make LIBTOOL=slibtool -C src/lzmainfo install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX}; make LIBTOOL=slibtool -C src/scripts install-nodist_binSCRIPTS DESTDIR=${PREFIX_MINIPIX}; make LIBTOOL=slibtool -C src/xz install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX}; |