Implements ccache integration, pt. II.

1 files changed, 8 insertions, 8 deletions

diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 3032afc2..fbfed1ab 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -18,7 +18,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_BASH_VERSION:=5.2.15};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
 : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
-: ${PKG_BASH_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_BASH_MAKEFLAGS_PARALLELISE:="-j1"};
 : ${PKG_BC_SHA256SUM:=62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a};
 : ${PKG_BC_VERSION:=1.07.1};
 : ${PKG_BC_URL:=https://ftp.gnu.org/gnu/bc/bc-${PKG_BC_VERSION}.tar.gz};
@@ -77,7 +77,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_ED_SHA256SUM:=ce2f2e5c424790aa96d09dacb93d9bbfdc0b7eb6249c9cb7538452e8ec77cd48};
 : ${PKG_ED_VERSION:=1.19};
 : ${PKG_ED_URL:=https://ftp.gnu.org/gnu/ed/ed-${PKG_ED_VERSION}.tar.lz};
-: ${PKG_ED_CONFIGURE_ARGS:="--prefix= CC=${DEFAULT_TARGET}-gcc"};
+: ${PKG_ED_CONFIGURE_ARGS_LIST:="--prefix=:CC=${DEFAULT_NATIVE_CC}"};
 : ${PKG_EXIF_DEPENDS:="libexif popt"};
 : ${PKG_EXIF_SHA256SUM:=0fe268736e0ca0538d4af941022761a438854a64c8024a4175e57bf0418117b9};
 : ${PKG_EXIF_VERSION:=0.6.22};
@@ -86,7 +86,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_FIGLET_VERSION:=2.2.5};
 : ${PKG_FIGLET_URL:=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${PKG_FIGLET_VERSION}.tar.gz};
 : ${PKG_FIGLET_IN_TREE:=1};
-: ${PKG_FIGLET_MAKEFLAGS_BUILD:=CC=${DEFAULT_TARGET}-gcc LD=${DEFAULT_TARGET}-gcc};
+: ${PKG_FIGLET_MAKEFLAGS_BUILD_LIST:=CC=${DEFAULT_NATIVE_CC}:LD=${DEFAULT_NATIVE_CC}};
 : ${PKG_FINDUTILS_SHA256SUM:=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe};
 : ${PKG_FINDUTILS_VERSION:=4.9.0};
 : ${PKG_FINDUTILS_URL:=https://ftp.gnu.org/gnu/findutils/findutils-${PKG_FINDUTILS_VERSION}.tar.xz};
@@ -131,7 +131,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_MKSH_VERSION:=R54};
 : ${PKG_MKSH_URL:="https://sources.voidlinux.org/mksh-${PKG_MKSH_VERSION}/mksh-${PKG_MKSH_VERSION}.tgz http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-${PKG_MKSH_VERSION}.tgz"};
 : ${PKG_MKSH_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc"};
+: ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${DEFAULT_NATIVE_CC}"};
 : ${PKG_MKSH_INSTALL_FILES_V2:="
 	+../mksh/mksh=bin/%[FNAME]
 	/=share/doc/mksh/examples
@@ -143,7 +143,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_MOE_SHA256SUM:=43a557bc512f89d6c718e5f41029cfe3a055682620eb8dbece6302f34a26146b};
 : ${PKG_MOE_VERSION:=1.13};
 : ${PKG_MOE_URL:=https://ftp.gnu.org/gnu/moe/moe-${PKG_MOE_VERSION}.tar.lz};
-: ${PKG_MOE_CONFIGURE_ARGS:="--prefix= CXX=${DEFAULT_TARGET}-g++"};
+: ${PKG_MOE_CONFIGURE_ARGS_LIST:="--prefix=:CXX=${DEFAULT_NATIVE_CXX}"};
 : ${PKG_MOE_ENV_VARS_EXTRA:="CXXFLAGS=${DEFAULT_CXXFLAGS}"};
 : ${PKG_MOON_BUGGY_DEPENDS:="ncurses"};
 : ${PKG_MOON_BUGGY_SHA256SUM:=352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f};
@@ -205,7 +205,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh";
 : ${PKG_PV_VERSION:=1.6.20};
 : ${PKG_PV_URL:=http://www.ivarch.com/programs/sources/pv-${PKG_PV_VERSION}.tar.bz2};
 : ${PKG_PV_DEBUG_CONFIGURE_ARGS_EXTRA:=--enable-debugging};
-: ${PKG_PV_MAKEFLAGS_BUILD:="LD=${DEFAULT_TARGET}-ld"};
+: ${PKG_PV_MAKEFLAGS_BUILD_LIST:="LD=${DEFAULT_NATIVE_LD}"};
 : ${PKG_RC_DEPENDS:="ncurses readline"};
 : ${PKG_RC_SHA256SUM:=5ed26334dd0c1a616248b15ad7c90ca678ae3066fa02c5ddd0e6936f9af9bfd8};
 : ${PKG_RC_VERSION:=1.7.4};
@@ -235,7 +235,7 @@ rc_cv_sysv_sigcld=no"};
 : ${PKG_SCREEN_URL:=https://ftp.gnu.org/gnu/screen/screen-${PKG_SCREEN_VERSION}.tar.gz};
 : ${PKG_SCREEN_CONFIGURE_ARGS_EXTRA:="--disable-pam"};
 : ${PKG_SCREEN_IN_TREE:=1};
-: ${PKG_SCREEN_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_SCREEN_MAKEFLAGS_PARALLELISE:="-j1"};
 : ${PKG_SED_SHA256SUM:=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181};
 : ${PKG_SED_VERSION:=4.9};
 : ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.xz};
@@ -282,7 +282,7 @@ libopts_cv_run_fopen_binary=yes"};
 	../terminally_tetris/man/ttetris.1=share/man/man1/%[FNAME]"};
 : ${PKG_TERMINALLY_TETRIS_IN_TREE:=1};
 : ${PKG_TERMINALLY_TETRIS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lncurses -Wl,--as-needed -ltinfo -Wl,--no-as-needed"};
-: ${PKG_TERMINALLY_TETRIS_MAKEFLAGS_BUILD_EXTRA:=C=${DEFAULT_TARGET}-gcc};
+: ${PKG_TERMINALLY_TETRIS_MAKEFLAGS_BUILD_EXTRA_LIST:=C=${DEFAULT_NATIVE_CC}};
 : ${PKG_UBASE_URLS_GIT:="ubase=http://git.suckless.org/ubase@master"};
 : ${PKG_UBASE_DESTDIR:=destdir/suckless};
 : ${PKG_UBASE_CFLAGS_BUILD_EXTRA:="-std=c99 --include=sys/sysmacros.h"};