diff --git a/build.sh b/build.sh
index efe554f..b4c5c36 100755
--- a/build.sh
+++ b/build.sh
@@ -83,9 +83,9 @@ buildp_init() {
"${_bi_name_base}" "${ARG_THEME:-}" \
|| ! ex_init_logging "${_bi_rstatus}" \$ARG_VERBOSE_TAGS "${ARG_VERBOSE}" \
|| ! ex_pkg_load_vars "${_bi_rstatus}" \$ARCH \$BUILD_KIND \
+ || ! buildp_init_args_ccache "${_bi_rstatus}" \
|| ! ex_init_prereqs "${_bi_rstatus}" "${DEFAULT_PREREQS}" \
|| ! buildp_init_args "${_bi_rstatus}" \
- || ! buildp_init_args_ccache "${_bi_rstatus}" \
|| ! ex_init_files \
"${_bi_rstatus}" \
\$ARG_CLEAN_BUILDS \$ARG_DIST \
diff --git a/etc/README.md b/etc/README.md
index 990c651..7c486d4 100644
--- a/etc/README.md
+++ b/etc/README.md
@@ -731,8 +731,10 @@ VERSION`` and/or ``URLS_GIT``, respectively.
| CONFIG_CACHE_EXTRA | List(\n) | Additional GNU autotools configuration cache variables |
| CONFIG_CACHE | List(\n) | GNU autotools configuration cache variables |
| CONFIG_CACHE_LOCAL | List(\n) | Additional GNU autotools configuration cache variables |
-| CONFIGURE_ARGS_EXTRA | FlagLine | Additional arguments to package (GNU autotools in implementation and/or interface) configuration script |
| CONFIGURE_ARGS | FlagLine | Arguments to package (GNU autotools in implementation and/or interface) configuration script |
+| CONFIGURE_ARGS_EXTRA | FlagLine | Additional arguments to package (GNU autotools in implementation and/or interface) configuration script |
+| CONFIGURE_ARGS_LIST | List(:) | Arguments to package (GNU autotools in implementation and/or interface) configuration script |
+| CONFIGURE_ARGS_EXTRA_LIST | List(:) | Additional arguments to package (GNU autotools in implementation and/or interface) configuration script |
| CONFIGURE | CmdName | Package's (GNU autotools in implementation and/or interface) configuration script |
| CONFIGURE_TYPE | String | Either of ``autotools`` (GNU autotools or similar) or ``sofort`` or ``cmake`` (CMake) |
| CXX | CmdName | Toolchain C++ compiler ``c++(1)`` |
@@ -759,10 +761,15 @@ VERSION`` and/or ``URLS_GIT``, respectively.
| LDFLAGS_CONFIGURE | FlagLine | Linker flags during package (GNU autotools in implementation and/or interface) configuration |
| LIBTOOL | CmdName | ``libtool(1)`` implementation (defaults to ``slibtool``) |
| MAKE | CmdLine | Command line of ``make(1)`` |
-| MAKEFLAGS_BUILD_EXTRA | FlagLine | Additional ``make(1)`` flags during package ``make(1)`` build; subject to field splitting w/ ``:`` |
| MAKEFLAGS_BUILD | FlagLine | ``make(1)`` flags during package ``make(1)`` build; subject to field splitting w/ ``:`` |
-| MAKEFLAGS_INSTALL_EXTRA | FlagLine | ``make(1)`` flags during package ``make(1)`` installation; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_BUILD_EXTRA | FlagLine | Additional ``make(1)`` flags during package ``make(1)`` build; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_BUILD_LIST | List(:) | ``make(1)`` flags during package ``make(1)`` build; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_BUILD_EXTRA_LIST | List(:) | Additional ``make(1)`` flags during package ``make(1)`` build; subject to field splitting w/ ``:`` |
| MAKEFLAGS_INSTALL | FlagLine | ``make(1)`` flags during package ``make(1)`` installation; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_INSTALL_EXTRA | FlagLine | ``make(1)`` flags during package ``make(1)`` installation; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_INSTALL_LIST | List(:) | ``make(1)`` flags during package ``make(1)`` installation; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_INSTALL_EXTRA_LIST | List(:) | ``make(1)`` flags during package ``make(1)`` installation; subject to field splitting w/ ``:`` |
+| MAKEFLAGS_PARALLELISE | FlagLine | ``make(1)`` parallelisation (e.g. -l, -j) flags |
| MAKEFLAGS_VERBOSITY | String | Variable-value pair to pass to ``make(1)`` in order to force echo-back of command lines prior to execution |
| MAKE_INSTALL_VNAME | String | Variable name of ``make(1)`` installation destination directory variable during package ``make(1)`` installation |
| MAKE_SUBDIRS | List( ) | ``make(1)`` subdirectories to exclusively build |
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index d5bf081..d7491bd 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -37,7 +37,7 @@ HOST_DEPS_TOOLS_RPM_DISABLE=1;
: ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz};
: ${PKG_BISON_HOST_ENV_VARS_EXTRA:="M4=${PREFIX}/bin/m4"};
: ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
-: ${PKG_BMAKE_HOST_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_BMAKE_HOST_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--with-default-sys-path=${PREFIX}/share/mk};
: ${PKG_BMAKE_HOST_CFLAGS_BUILD_EXTRA:="-fcommon"};
: ${PKG_BMAKE_HOST_LDFLAGS_BUILD_EXTRA:="-fcommon"};
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 3032afc..fbfed1a 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"};
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index 3119d7a..bbe22e8 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -22,11 +22,11 @@ ac_cv_prog_gnu_m4_gnu=yes"};
: ${PKG_CHICKEN_VERSION:=5.3.0};
: ${PKG_CHICKEN_URL:=https://code.call-cc.org/releases/${PKG_CHICKEN_VERSION}/chicken-${PKG_CHICKEN_VERSION}.tar.gz};
: ${PKG_CHICKEN_IN_TREE:=1};
-: ${PKG_CHICKEN_MAKEFLAGS_BUILD:="PLATFORM=midipix ARCH=${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${DEFAULT_TARGET}-gcc HOSTSYSTEM=${DEFAULT_TARGET}"};
-: ${PKG_CHICKEN_DEBUG_MAKEFLAGS_BUILD_EXTRA:=DEBUGBUILD=1};
-: ${PKG_CHICKEN_RELEASE_MAKEFLAGS_BUILD_EXTRA:=DEBUGBUILD=0};
-: ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix ARCH=${ARCH} PREFIX=${PREFIX_NATIVE} C_COMPILER=${DEFAULT_TARGET}-gcc HOSTSYSTEM=${DEFAULT_TARGET} CROSS_CHICKEN=1"};
-: ${PKG_CHICKEN_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= TARGET_PREFIX="};
+: ${PKG_CHICKEN_MAKEFLAGS_BUILD_LIST:="PLATFORM=midipix:ARCH=${ARCH}:PREFIX=${PREFIX_NATIVE}:TARGET_PREFIX=${PREFIX_NATIVE}:C_COMPILER=${DEFAULT_NATIVE_CC}:HOSTSYSTEM=${DEFAULT_TARGET}"};
+: ${PKG_CHICKEN_DEBUG_MAKEFLAGS_BUILD_EXTRA_LIST:=DEBUGBUILD=1};
+: ${PKG_CHICKEN_RELEASE_MAKEFLAGS_BUILD_EXTRA_LIST:=DEBUGBUILD=0};
+: ${PKG_CHICKEN_MAKEFLAGS_INSTALL_LIST:="PLATFORM=midipix:ARCH=${ARCH}:PREFIX=${PREFIX_NATIVE}:C_COMPILER=${DEFAULT_NATIVE_CC}:HOSTSYSTEM=${DEFAULT_TARGET}:CROSS_CHICKEN=1"};
+: ${PKG_CHICKEN_MAKEFLAGS_INSTALL_EXTRA_LIST:="PREFIX=:TARGET_PREFIX="};
: ${PKG_CHICKEN_MAKE_INSTALL_VNAME:=DESTDIR};
: ${PKG_CPARSER_DEPENDS:="libfirm"};
: ${PKG_CPARSER_URLS_GIT:="cparser=http://github.com/lalbornoz/cparser.git@main bcparser=${DEFAULT_GITROOT}/compilers/bcparser@main"};
@@ -106,7 +106,7 @@ make_cv_synchronous_posix_spawn=yes"};
: ${PKG_MANDOC_SHA256SUM:=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7};
: ${PKG_MANDOC_VERSION:=1.14.5};
: ${PKG_MANDOC_URL:=https://mandoc.bsd.lv/snapshots/mandoc-${PKG_MANDOC_VERSION}.tar.gz};
-: ${PKG_MANDOC_MAKEFLAGS_BUILD_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib:LDADD=-Wl,-lz,-lfts:HAVE_REALLOCARRAY=0"};
+: ${PKG_MANDOC_MAKEFLAGS_BUILD_EXTRA_LIST:="CC=${DEFAULT_NATIVE_CC}:CFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib:LDADD=-Wl,-lz,-lfts:HAVE_REALLOCARRAY=0"};
: ${PKG_MANDOC_CFLAGS_BUILD_EXTRA:="-g3 -O0"};
: ${PKG_MANDOC_IN_TREE:=1};
: ${PKG_NASM_SHA256SUM:=e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5};
@@ -127,7 +127,8 @@ make_cv_synchronous_posix_spawn=yes"};
: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_NATIVE}/include -Duseshrplib -Darchname=${DEFAULT_TARGET} -Darchlib=/usr/lib/perl5/${PKG_PERL_VERSION}/${DEFAULT_TARGET} -Dsitearch=/usr/lib/perl5/site_perl/${PKG_PERL_VERSION}/${DEFAULT_TARGET} --sysroot=${PREFIX_NATIVE} --target=${DEFAULT_TARGET}"};
: ${PKG_PERL_CFLAGS_CONFIGURE_EXTRA:="-std=gnu99"};
: ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${DEFAULT_TARGET}"};
-: ${PKG_PERL_MAKEFLAGS_BUILD:="-j1 PERL_ARCHIVE_AFTER=${PREFIX}/tmp/perl-native-${DEFAULT_TARGET}/perl-${PKG_PERL_VERSION}/libperl.so OTHERLDFLAGS=--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_PERL_MAKEFLAGS_BUILD:="PERL_ARCHIVE_AFTER=${PREFIX}/tmp/perl-native-${DEFAULT_TARGET}/perl-${PKG_PERL_VERSION}/libperl.so OTHERLDFLAGS=--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_PERL_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_PERL_INSTALL_FILES_V2:="+%[_subdir]/libperl.so=lib/libperl.so"};
: ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}};
: ${PKG_PERL_IN_TREE:=1};
@@ -164,7 +165,7 @@ make_cv_synchronous_posix_spawn=yes"};
: ${PKG_RUBY_VERSION:=2.3.0};
: ${PKG_RUBY_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_VERSION%.*}/ruby-${PKG_RUBY_VERSION}.tar.gz};
: ${PKG_RUBY_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-baseruby=${PREFIX}/bin/ruby --with-out-ext=fiddle,openssl"};
-: ${PKG_RUBY_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_RUBY_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_RUBY_MAKEFLAGS_VERBOSITY:="none"};
: ${PKG_SBSIGNTOOLS_DEPENDS:="libressl"};
: ${PKG_SBSIGNTOOLS_URLS_GIT:=sbsigntools-master=https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git@master};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index cce1964..f71e324 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -24,14 +24,14 @@ zstd";
: ${PKG_APR_UTIL_ENV_VARS_EXTRA:="LDADD_dbd_sqlite3=-lsqlite3 -lapr-1 -L.libs -laprutil-1:LDADD_crypto_openssl=-lcrypto -lssl -lapr-1 -L.libs -laprutil-1"};
: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-crypto --with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
: ${PKG_APR_UTIL_INSTALL_FILES_V2:="+bin/apu-1-config=%[_prefix_host]/bin/%[_target]-%[FNAME]"};
-: ${PKG_APR_UTIL_MAKEFLAGS_BUILD:="-j1"};
+: ${PKG_APR_UTIL_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_BDWGC_DEPENDS:="libatomic_ops"};
: ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
: ${PKG_BDWGC_CONFIGURE_ARGS_EXTRA:="--enable-threads=posix --enable-parallel-mark --enable-handle-fork"};
: ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
: ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
: ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
-: ${PKG_BMAKE_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_BMAKE_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_BOCHS_DEPENDS:="curl ncurses sdl1"};
: ${PKG_BOCHS_SHA256SUM:=a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a};
: ${PKG_BOCHS_VERSION:=2.7};
@@ -63,7 +63,7 @@ zstd";
: ${PKG_CLZIP_SHA256SUM:=7ac9fbf5036bf50fb0b6a20e84d2293cb0d24d4044eaf33cbe9760bb9e7fea7a};
: ${PKG_CLZIP_VERSION:=1.13};
: ${PKG_CLZIP_URL:=https://download.savannah.gnu.org/releases/lzip/clzip/clzip-${PKG_CLZIP_VERSION}.tar.gz};
-: ${PKG_CLZIP_CONFIGURE_ARGS:="CC=${DEFAULT_TARGET}-gcc --prefix="};
+: ${PKG_CLZIP_CONFIGURE_ARGS_LIST:="CC=${DEFAULT_NATIVE_CC}:--prefix="};
: ${PKG_CLZIP_INSTALL_FILES_V2:="@clzip=bin/lzip"};
: ${PKG_CLZIP_IN_TREE:=1};
: ${PKG_CMAKE_DEPENDS:="curl libarchive libuv libz ncurses"};
@@ -97,7 +97,7 @@ zstd";
-DZLIB_LIBRARY=${PREFIX_NATIVE}/lib/libz.a"};
: ${PKG_CMAKE_CONFIGURE_TYPE:="cmake"};
: ${PKG_CRON_URLS_GIT:="pkg-cron=https://github.com/lalbornoz/pkg-cron@master"};
-: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
+: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_NATIVE_CC}:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
: ${PKG_CRON_IN_TREE:=1};
: ${PKG_DANTE_DEPENDS:="libtirpc"};
: ${PKG_DANTE_SHA256SUM:=418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d};
@@ -137,7 +137,7 @@ zstd";
: ${PKG_FFMPEG_SHA256SUM:=57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082};
: ${PKG_FFMPEG_VERSION:=6.0};
: ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.xz};
-: ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --enable-cross-compile --enable-libass --enable-libshine --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-gpl --enable-version3 --enable-gnutls --enable-libmp3lame --enable-libssh --enable-libtwolame --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix --x86asmexe=${DEFAULT_TARGET}-nasm"};
+: ${PKG_FFMPEG_CONFIGURE_ARGS_LIST:="--cc=${DEFAULT_NATIVE_CC}:--cxx=${DEFAULT_NATIVE_CXX}:--disable-stripping:--enable-cross-compile:--enable-libass:--enable-libshine:--enable-libtheora:--enable-libvorbis:--enable-libxml2:--enable-gpl:--enable-version3:--enable-gnutls:--enable-libmp3lame:--enable-libssh:--enable-libtwolame:--pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config:--prefix=/:--target-os=midipix:--x86asmexe=${DEFAULT_TARGET}-nasm"};
: ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"};
: ${PKG_FILE_DEPENDS:="xz bzip2 libz"};
: ${PKG_FILE_SHA256SUM:=3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b};
@@ -374,7 +374,7 @@ have_shm_mmap_posix=yes"};
: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp --disable-gd --disable-phar --enable-pdo=static --enable-dom=static --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --disable-pcntl --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --with-pdo-odbc=no --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --with-bz2=${PREFIX_NATIVE} --disable-opcache-jit --disable-dl-test"};
: ${PKG_PHP_ENV_VARS_EXTRA:="HOST_CC=gcc:READLINE_DIR=${PREFIX_NATIVE}/include/readline"};
: ${PKG_PHP_LIBTOOL:=rdlibtool};
-: ${PKG_PHP_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_PHP_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_PHP_INSTALL_FILES_V2:="+../obj/libs/libphp.so=lib/%[FNAME]"};
: ${PKG_POPT_DEPENDS:="libiconv"};
: ${PKG_POPT_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1};
@@ -400,7 +400,7 @@ have_shm_mmap_posix=yes"};
: ${PKG_QEMU_VERSION:=3.1.0};
: ${PKG_QEMU_URL:=https://download.qemu.org/qemu-${PKG_QEMU_VERSION}.tar.xz};
: ${PKG_QEMU_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/w32api.ports"};
-: ${PKG_QEMU_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --cc=${DEFAULT_TARGET}-gcc --disable-strip --disable-sdl"};
+: ${PKG_QEMU_CONFIGURE_ARGS_LIST:="--host=${DEFAULT_TARGET}:--prefix=:--cc=${DEFAULT_NATIVE_CC}:--disable-strip:--disable-sdl"};
: ${PKG_QPDF_DEPENDS:="libz pcre"};
: ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};
: ${PKG_QPDF_VERSION:=6.0.0};
@@ -432,13 +432,13 @@ have_shm_mmap_posix=yes"};
: ${PKG_SHARED_MIME_INFO_VERSION:=1.8};
: ${PKG_SHARED_MIME_INFO_URL:=http://freedesktop.org/~hadess/shared-mime-info-${PKG_SHARED_MIME_INFO_VERSION}.tar.xz};
: ${PKG_SHARED_MIME_INFO_CONFIGURE_ARGS_EXTRA:=--disable-update-mimedb};
-: ${PKG_SHARED_MIME_INFO_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_SHARED_MIME_INFO_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_SLANG_DEPENDS:="libpng ncursesw"};
: ${PKG_SLANG_SHA256SUM:=f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18};
: ${PKG_SLANG_VERSION:=2.3.3};
: ${PKG_SLANG_URL:=https://www.jedsoft.org/releases/slang/slang-${PKG_SLANG_VERSION}.tar.bz2};
: ${PKG_SLANG_IN_TREE:=1};
-: ${PKG_SLANG_MAKEFLAGS_BUILD_EXTRA:=-j1};
+: ${PKG_SLANG_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_SQLITE3_DEPENDS:="ncurses readline libz"};
: ${PKG_SQLITE3_SHA256SUM:=2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9};
: ${PKG_SQLITE3_VERSION:=3400100};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 200e4c2..c71813f 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -20,7 +20,7 @@ proxytunnel rsync socat thttpd w3m weechat wget wget2 whois";
: ${PKG_BIND_VERSION:=9.13.2};
: ${PKG_BIND_URL:=https://ftp.isc.org/isc/bind/${PKG_BIND_VERSION}/bind-${PKG_BIND_VERSION}.tar.gz};
: ${PKG_BIND_CONFIGURE_ARGS_EXTRA:="--with-libtool --disable-backtrace --with-eddsa=no --with-ecdsa=yes --with-gssapi=no --with-libxml2=no --with-libjson=no --with-openssl=${PREFIX_NATIVE} --without-lmdb BUILD_CC=gcc"};
-: ${PKG_BIND_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_BIND_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_CA_CERTIFICATES_DEPENDS:="libressl"};
: ${PKG_CA_CERTIFICATES_URLS_GIT:="cacerts=https://dev.midipix.org/distro/cacerts.git@main"};
: ${PKG_CA_CERTIFICATES_IN_TREE:=1};
@@ -124,7 +124,7 @@ gl_cv_ld_output_def=no"};
: ${PKG_LDNS_VERSION:=1.7.0};
: ${PKG_LDNS_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/ldns/ldns-${PKG_LDNS_VERSION}.tar.gz};
: ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"};
-: ${PKG_LDNS_MAKEFLAGS_BUILD:="-j1"};
+: ${PKG_LDNS_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"};
: ${PKG_LIGHTTPD_SHA256SUM:=16ac8db95e719629ba61949b99f8a26feba946a81d185215b28379bb4116b0b4};
: ${PKG_LIGHTTPD_VERSION:=1.4.69};
@@ -168,7 +168,7 @@ mutt_cv_regex_broken=no"};
: ${PKG_NGINX_URL:=http://nginx.org/download/nginx-${PKG_NGINX_VERSION}.tar.gz};
: ${PKG_NGINX_CFLAGS_BUILD_EXTRA:="-Wno-sign-compare"};
: ${PKG_NGINX_CONFIGURE_ARGS:="--prefix="};
-: ${PKG_NGINX_ENV_VARS_EXTRA:=CC=${DEFAULT_TARGET}-gcc};
+: ${PKG_NGINX_ENV_VARS_EXTRA:=CC=${DEFAULT_NATIVE_CC}};
: ${PKG_NGINX_IN_TREE:=1};
: ${PKG_NGIRCD_DEPENDS:="gnutls"};
: ${PKG_NGIRCD_SHA256SUM:=55c16fd26009f6fc6a007df4efac87a02e122f680612cda1ce26e17a18d86254};
@@ -192,7 +192,7 @@ mutt_cv_regex_broken=no"};
: ${PKG_OPENLITESPEED_DESTDIR:=destdir/lsws};
: ${PKG_OPENLITESPEED_DISABLED:=1};
: ${PKG_OPENLITESPEED_IN_TREE:=1};
-: ${PKG_OPENLITESPEED_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_OPENLITESPEED_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_OPENLITESPEED_PREFIX:=${PREFIX_NATIVE}/lsws};
: ${PKG_OPENSMTPD_DEPENDS:="libevent libressl libz musl_fts"};
: ${PKG_OPENSMTPD_SHA256SUM:=51bf05312fe56764748faab9e63170bfbb7c7d84a37c4117b62b2681eb3a4d17};
@@ -231,7 +231,7 @@ mutt_cv_regex_broken=no"};
: ${PKG_THTTPD_URL:=https://acme.com/software/thttpd/thttpd-${PKG_THTTPD_VERSION}.tar.gz};
: ${PKG_THTTPD_CONFIGURE_ARGS:="--disable-nls --host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"};
: ${PKG_THTTPD_IN_TREE:=1};
-: ${PKG_THTTPD_MAKEFLAGS_BUILD_EXTRA:=-j1};
+: ${PKG_THTTPD_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_THTTPD_MAKE_INSTALL_VNAME:=prefix};
: ${PKG_W3M_DEPENDS:="bdwgc imlib2 libressl ncurses"};
: ${PKG_W3M_SHA256SUM:=0467bb5429b75749205a3f57b9f5e8abba49929272aeab6fce94ff17953f0784};
@@ -241,7 +241,7 @@ mutt_cv_regex_broken=no"};
: ${PKG_W3M_CONFIGURE_ARGS_EXTRA:="--with-ssl --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"};
: ${PKG_W3M_ENV_VARS_EXTRA:="LIBS=-ltinfo"};
: ${PKG_W3M_IN_TREE:=1};
-: ${PKG_W3M_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_W3M_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105};
: ${PKG_WEECHAT_DEPENDS:="aspell curl gnutls libgcrypt libz ncursesw perl"};
: ${PKG_WEECHAT_SHA256SUM:=d9d27fac127c724564cf28c6179fa6ecc79a61f9dad09a3b251500f2b0755409};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 7f561fd..bf26fca 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -118,7 +118,7 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net twolame wolfssl";
: ${PKG_LIBFETCH_URL:=https://sources.archlinux.org/other/libfetch/libfetch-${PKG_LIBFETCH_VERSION}.tar.gz};
: ${PKG_LIBFETCH_ENV_VARS_EXTRA:=CFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=--sysroot=${PREFIX_NATIVE}};
: ${PKG_LIBFETCH_IN_TREE:=1};
-: ${PKG_LIBFETCH_MAKEFLAGS_BUILD_EXTRA:="E=echo Q= AR=${DEFAULT_TARGET}-ar CC=${DEFAULT_TARGET}-gcc LD=${DEFAULT_TARGET}-gcc"};
+: ${PKG_LIBFETCH_MAKEFLAGS_BUILD_EXTRA_LIST:="E=echo:Q=:AR=${DEFAULT_TARGET}-ar:CC=${DEFAULT_NATIVE_CC}:LD=${DEFAULT_NATIVE_CC}"};
: ${PKG_LIBFETCH_MAKEFLAGS_INSTALL_EXTRA:="E=echo Q="};
: ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
: ${PKG_LIBFFI_VERSION:=3.2.1};
@@ -228,7 +228,7 @@ ksba_cv_visibility_attribute=yes"};
: ${PKG_LIBSASL2_VERSION:=2.1.28};
: ${PKG_LIBSASL2_URL:="https://ftp.osuosl.org/pub/blfs/conglomeration/cyrus-sasl/cyrus-sasl-${PKG_LIBSASL2_VERSION}.tar.gz"};
: ${PKG_LIBSASL2_CONFIGURE_ARGS_EXTRA:="--cache-file=../obj/config.cache"};
-: ${PKG_LIBSASL2_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_LIBSASL2_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_LIBSHINE_SHA256SUM:=58e61e70128cf73f88635db495bfc17f0dde3ce9c9ac070d505a0cd75b93d384};
: ${PKG_LIBSHINE_VERSION:=3.1.1};
: ${PKG_LIBSHINE_URL:=https://github.com/toots/shine/releases/download/${PKG_LIBSHINE_VERSION}/shine-${PKG_LIBSHINE_VERSION}.tar.gz};
@@ -297,7 +297,7 @@ gl_cv_ld_output_def=no"};
: ${PKG_LIBTHEORA_VERSION:=1.1.1};
: ${PKG_LIBTHEORA_URL:=http://downloads.xiph.org/releases/theora/libtheora-${PKG_LIBTHEORA_VERSION}.tar.bz2};
: ${PKG_LIBTHEORA_IN_TREE:=1};
-: ${PKG_LIBTHEORA_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_LIBTHEORA_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_LIBTIRPC_DEPENDS:="musl_compat"};
: ${PKG_LIBTIRPC_SHA256SUM:=245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17};
: ${PKG_LIBTIRPC_VERSION:=1.3.1};
@@ -357,7 +357,7 @@ gl_cv_ld_output_def=no"};
: ${PKG_LZLIB_SHA256SUM:=a1ab58f3148ba4b2674e938438166042137a9275bed747306641acfddc9ffb80};
: ${PKG_LZLIB_VERSION:=1.13};
: ${PKG_LZLIB_URL:=http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-${PKG_LZLIB_VERSION}.tar.gz};
-: ${PKG_LZLIB_CONFIGURE_ARGS:=--prefix= CC=${DEFAULT_TARGET}-gcc AR=${DEFAULT_TARGET}-ar};
+: ${PKG_LZLIB_CONFIGURE_ARGS_LIST:="--prefix=:CC=${DEFAULT_NATIVE_CC}:AR=${DEFAULT_TARGET}-ar"};
: ${PKG_LZLIB_CFLAGS_BUILD:=${DEFAULT_CFLAGS}};
: ${PKG_ONIG_SHA256SUM:=28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e};
: ${PKG_ONIG_VERSION:=6.9.8};
@@ -375,7 +375,7 @@ gl_cv_ld_output_def=no"};
: ${PKG_NETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99};
: ${PKG_NETTLE_CONFIG_CACHE_EXTRA:="nettle_cv_asm_underscore=no"};
: ${PKG_NETTLE_INSTALL_FILES_V2:="m0755=lib/%<lib*.so>"};
-: ${PKG_NETTLE_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_NETTLE_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_READLINE_DEPENDS:="ncurses ncursestw ncursesw"};
: ${PKG_READLINE_SHA256SUM:=3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35};
: ${PKG_READLINE_VERSION:=8.2};
@@ -429,7 +429,7 @@ bash_cv_func_sigsetjmp=yes"};
: ${PKG_SDL2_CONFIGURE_ARGS_EXTRA:="--disable-video-vulkan --disable-video-opengles2 --disable-alsa --disable-static --disable-power"};
: ${PKG_SDL2_CFLAGS_CONFIGURE_EXTRA:="-DWINAPI_UTF16_DEFAULT -DUNICODE -DWINVER=0x0601 -I${PREFIX_NATIVE}/include/w32api.ports -DSDL_DISABLE_WINDOWS_IME"};
: ${PKG_SDL2_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib -lkernel32 -luser32 -lgdi32 -limm32 -lshell32 -lu16ports"};
-: ${PKG_SDL2_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_SDL2_MAKEFLAGS_PARALLELISE:="-j1"};
: ${PKG_SDL2_IN_TREE:=1};
: ${PKG_SDL2_FORCE_AUTORECONF:=1};
: ${PKG_SDL2_IMAGE_DEPENDS:="sdl2 libz libpng libjpeg_turbo tiff"};
diff --git a/midipix.env b/midipix.env
index e7903c0..97371e9 100644
--- a/midipix.env
+++ b/midipix.env
@@ -20,24 +20,25 @@ DEFAULT_BUILD_STEPS=" \
clean \
finish";
DEFAULT_BUILD_VARS=" \
- AR AUTOCONF_CONFIG_GUESS BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE \
- CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \
- CMAKE CMAKE_ARGS CMAKE_ARGS_EXTRA CMAKE_LISTFILE CONFIG_CACHE \
- CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS \
- CONFIGURE_ARGS_EXTRA CONFIGURE_TYPE CXX CXXFLAGS_CONFIGURE \
- CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR DESTDIR_HOST DISABLED \
- ENV_VARS_EXTRA FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES \
- INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_FILES_V2 \
- INSTALL_TARGET INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD LDFLAGS_BUILD_EXTRA \
- LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKEFLAGS_BUILD \
- MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \
- MAKEFLAGS_VERBOSITY MAKE_INSTALL_VNAME MAKE_SUBDIRS MIRRORS MIRRORS_GIT \
- NO_CLEAN NO_CLEAN_BASE_DIR NO_CLEAN_BUILD_DIR NO_LOG_VARS PATCHES_EXTRA PKG_CONFIG \
- PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX PYTHON RANLIB RPM_DISABLE \
+ AR AUTOCONF_CONFIG_GUESS BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE \
+ BUILD_TYPE CC CFLAGS_BUILD CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE \
+ CFLAGS_CONFIGURE_EXTRA CMAKE CMAKE_ARGS CMAKE_ARGS_EXTRA CMAKE_LISTFILE \
+ CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS \
+ CONFIGURE_ARGS_EXTRA CONFIGURE_ARGS_EXTRA_LIST CONFIGURE_ARGS_LIST CONFIGURE_TYPE \
+ CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR DESTDIR_HOST \
+ DISABLED ENV_VARS_EXTRA FNAME FORCE_AUTORECONF GITROOT INHERIT_FROM INSTALL_FILES \
+ INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_FILES_V2 INSTALL_TARGET \
+ INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \
+ LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA \
+ MAKEFLAGS_BUILD_EXTRA_LIST MAKEFLAGS_BUILD_LIST MAKEFLAGS_INSTALL \
+ MAKEFLAGS_INSTALL_EXTRA MAKEFLAGS_INSTALL_EXTRA_LIST MAKEFLAGS_INSTALL_LIST \
+ MAKEFLAGS_PARALLELISE MAKEFLAGS_VERBOSITY MAKE_INSTALL_VNAME MAKE_SUBDIRS MIRRORS \
+ MIRRORS_GIT NO_CLEAN NO_CLEAN_BASE_DIR NO_CLEAN_BUILD_DIR NO_LOG_VARS PATCHES_EXTRA \
+ PKG_CONFIG PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX PYTHON RANLIB RPM_DISABLE \
SHA256SUM SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS SOFORT_NATIVE_CFLAGS_EXTRA \
SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS SOFORT_NATIVE_CXXFLAGS_EXTRA \
- SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS SOFORT_NATIVE_LDFLAGS_EXTRA SUBDIR \
- TARGET URL URLS_GIT VARS_FILE VERSION";
+ SOFORT_NATIVE_LD SOFORT_NATIVE_LDFLAGS SOFORT_NATIVE_LDFLAGS_EXTRA SUBDIR TARGET \
+ URL URLS_GIT VARS_FILE VERSION";
#
# Prerequisite commands
@@ -150,6 +151,7 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R
: ${DEFAULT_HOST_CC:=gcc};
: ${DEFAULT_HOST_CMAKE:=cmake};
: ${DEFAULT_HOST_CXX:=g++};
+: ${DEFAULT_HOST_LD:=ld};
: ${DEFAULT_HOST_LIBTOOL:=slibtool};
: ${DEFAULT_HOST_MAKE:=make};
: ${DEFAULT_HOST_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
@@ -159,6 +161,7 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R
: ${DEFAULT_NATIVE_CC:=${DEFAULT_TARGET}-gcc};
: ${DEFAULT_NATIVE_CMAKE:=cmake};
: ${DEFAULT_NATIVE_CXX:=${DEFAULT_TARGET}-g++};
+: ${DEFAULT_NATIVE_LD:=${DEFAULT_TARGET}-ld};
: ${DEFAULT_NATIVE_LIBTOOL:=slibtool};
: ${DEFAULT_NATIVE_MAKE:=make};
: ${DEFAULT_NATIVE_PKG_CONFIG:=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config};
@@ -172,7 +175,7 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R
: ${DEFAULT_GITROOT:=git://midipix.org};
: ${DEFAULT_GITROOT_HEAD:=git://midipix.org};
: ${DEFAULT_MAKE_INSTALL_VNAME:=DESTDIR};
-: ${DEFAULT_MAKEFLAGS_BUILD:="-j${DEFAULT_BUILD_CPUS} -l${DEFAULT_BUILD_CPUS}"};
+: ${DEFAULT_MAKEFLAGS_PARALLELISE:="-j${DEFAULT_BUILD_CPUS} -l${DEFAULT_BUILD_CPUS}"};
: ${DEFAULT_MAKEFLAGS_VERBOSITY:="V=99 VERBOSE=1"};
: ${DEFAULT_GIT_ARGS:=""};
: ${DEFAULT_TIMESTAMP_FMT:="%Y/%m/%d %H:%M:%S"};
@@ -194,7 +197,7 @@ rtl_get_var_unsafe \$DEFAULT_LDFLAGS_RUNTIME -u "DEFAULT_LDFLAGS_${BUILD_KIND}_R
: ${DEFAULT_SOFORT_NATIVE_CFLAGS:="-I${PREFIX}/include"};
: ${DEFAULT_SOFORT_NATIVE_CXX:="${DEFAULT_HOST_CXX}"};
: ${DEFAULT_SOFORT_NATIVE_CXXFLAGS:="-I${PREFIX}/include"};
-: ${DEFAULT_SOFORT_NATIVE_LD:="${DEFAULT_HOST_CC}"};
+: ${DEFAULT_SOFORT_NATIVE_LD:="${DEFAULT_HOST_LD}"};
: ${DEFAULT_SOFORT_NATIVE_LDFLAGS:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"};
#
diff --git a/subr.pkg/pkg_build.subr b/subr.pkg/pkg_build.subr
index 71b057b..6eae109 100644
--- a/subr.pkg/pkg_build.subr
+++ b/subr.pkg/pkg_build.subr
@@ -34,26 +34,73 @@ pkg_build() {
# N.B. We only specify CC= here if the current package does not use GNU
# autoconf as it often abuses it by appending -std={gnu99,...} to it
# instead of amending CFLAGS.
- rtl_run_cmdlineV ":" "${PKG_MAKE}" \
- ${PKG_MAKEFLAGS_BUILD:-} \
- ${PKG_MAKEFLAGS_BUILD_EXTRA:-} \
- "AR=${PKG_AR}" \
- "${_pb_no_autoconf:+CC=${PKG_CC}}" \
- "RANLIB=${PKG_RANLIB}" \
- "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \
- "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \
- "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \
- "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \
- "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \
- "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \
- "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \
- "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}" \
- "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \
- "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \
- ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \
- ${_pb_makeflags_verbosity} \
- ${_pb_subdir:+-C "${_pb_subdir}"};
- _pb_rc="${?}";
+ if [ "${PKG_MAKEFLAGS_BUILD_LIST:+1}" = 1 ]; then
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ "AR=${PKG_AR}" \
+ "${_pb_no_autoconf:+CC=${PKG_CC}}" \
+ "RANLIB=${PKG_RANLIB}" \
+ "${PKG_MAKEFLAGS_BUILD_LIST}" \
+ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:-}" \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \
+ "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \
+ "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \
+ "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \
+ "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \
+ "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \
+ "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \
+ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}" \
+ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \
+ "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \
+ ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \
+ ${_pb_makeflags_verbosity} \
+ ${_pb_subdir:+-C "${_pb_subdir}"};
+ _pb_rc="${?}";
+ elif [ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:+1}" = 1 ]; then
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ "AR=${PKG_AR}" \
+ "${_pb_no_autoconf:+CC=${PKG_CC}}" \
+ "RANLIB=${PKG_RANLIB}" \
+ ${PKG_MAKEFLAGS_BUILD:-} \
+ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST}" \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \
+ "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \
+ "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \
+ "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \
+ "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \
+ "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \
+ "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \
+ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}" \
+ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \
+ "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \
+ ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \
+ ${_pb_makeflags_verbosity} \
+ ${_pb_subdir:+-C "${_pb_subdir}"};
+ _pb_rc="${?}";
+ else
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ "AR=${PKG_AR}" \
+ "${_pb_no_autoconf:+CC=${PKG_CC}}" \
+ "RANLIB=${PKG_RANLIB}" \
+ ${PKG_MAKEFLAGS_BUILD:-} \
+ ${PKG_MAKEFLAGS_BUILD_EXTRA:-} \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ "${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}" \
+ "${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}" \
+ "${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}" \
+ "${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}" \
+ "${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}" \
+ "${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}" \
+ "${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}" \
+ "${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}" \
+ "${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}" \
+ "${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}" \
+ ${_pb_libtool:+"LIBTOOL=${_pb_libtool}"} \
+ ${_pb_makeflags_verbosity} \
+ ${_pb_subdir:+-C "${_pb_subdir}"};
+ _pb_rc="${?}";
+ fi;
if [ "${#_pb_libtool}" -gt 0 ]; then
unset MAKE;
diff --git a/subr.pkg/pkg_build_clean.subr b/subr.pkg/pkg_build_clean.subr
index e345603..f92bfd6 100644
--- a/subr.pkg/pkg_build_clean.subr
+++ b/subr.pkg/pkg_build_clean.subr
@@ -20,14 +20,37 @@ pkg_build_clean() {
[ "${_pbc_subdir}" = ":" ] && _pbc_subdir="";
[ "${#_pbc_libtool}" -gt 0 ] && export MAKE="make LIBTOOL=${_pbc_libtool}";
- rtl_run_cmdlineV ":" "${PKG_MAKE}" \
- ${PKG_MAKEFLAGS_BUILD:-} \
- ${PKG_MAKEFLAGS_BUILD_EXTRA:-} \
- ${_pbc_libtool:+"LIBTOOL=${_pbc_libtool}"} \
- ${_pbc_makeflags_verbosity} \
- ${_pbc_subdir:+-C "${_pbc_subdir}"} \
- clean;
- _pbc_rc="${?}";
+ if [ "${PKG_MAKEFLAGS_BUILD_LIST:+1}" = 1 ]; then
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ "${PKG_MAKEFLAGS_BUILD_LIST}" \
+ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:-}" \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ ${_pbc_libtool:+"LIBTOOL=${_pbc_libtool}"} \
+ ${_pbc_makeflags_verbosity} \
+ ${_pbc_subdir:+-C "${_pbc_subdir}"} \
+ clean;
+ _pbc_rc="${?}";
+ elif [ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST:+1}" = 1 ]; then
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ ${PKG_MAKEFLAGS_BUILD:-} \
+ "${PKG_MAKEFLAGS_BUILD_EXTRA_LIST}" \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ ${_pbc_libtool:+"LIBTOOL=${_pbc_libtool}"} \
+ ${_pbc_makeflags_verbosity} \
+ ${_pbc_subdir:+-C "${_pbc_subdir}"} \
+ clean;
+ _pbc_rc="${?}";
+ else
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ ${PKG_MAKEFLAGS_BUILD:-} \
+ ${PKG_MAKEFLAGS_BUILD_EXTRA:-} \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ ${_pbc_libtool:+"LIBTOOL=${_pbc_libtool}"} \
+ ${_pbc_makeflags_verbosity} \
+ ${_pbc_subdir:+-C "${_pbc_subdir}"} \
+ clean;
+ _pbc_rc="${?}";
+ fi;
[ "${#_pbc_libtool}" -gt 0 ] && unset MAKE;
[ "${_pbc_rc}" -ne 0 ] && return 1;
diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index 743ab9d..5403cae 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -25,15 +25,43 @@ pkgp_configure_autotools() {
PYTHON "${PKG_PYTHON:-}" \
${_ppca_libtool:+MAKE} ${_ppca_libtool:+"make LIBTOOL=${_ppca_libtool}"};
- AR="${PKG_AR}" \
- CC="${PKG_CC}" \
- RANLIB="${PKG_RANLIB}" \
- CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
- CPPFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
- CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \
- LDFLAGS="${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \
- "${PKG_CONFIGURE}" ${PKG_CONFIGURE_ARGS:-} ${PKG_CONFIGURE_ARGS_EXTRA:-} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG:-};
- _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ if [ "${PKG_CONFIGURE_ARGS_LIST:+1}" = 1 ]; then
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CPPFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \
+ LDFLAGS="${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \
+ rtl_run_cmdlineV ":" "${PKG_CONFIGURE}" \
+ "${PKG_CONFIGURE_ARGS_LIST:-}" \
+ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:-}";
+ _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ elif [ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:+1}" = 1 ]; then
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CPPFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \
+ LDFLAGS="${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \
+ rtl_run_cmdlineV ":" "${PKG_CONFIGURE}" \
+ ${PKG_CONFIGURE_ARGS:-} \
+ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:-}";
+ _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ else
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CPPFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \
+ CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE:-}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \
+ LDFLAGS="${PKG_LDFLAGS_CONFIGURE:-}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \
+ "${PKG_CONFIGURE}" \
+ ${PKG_CONFIGURE_ARGS:-} \
+ ${PKG_CONFIGURE_ARGS_EXTRA:-};
+ _ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+ fi;
rtl_export_vars -u \
PKG_CONFIG "${PKG_PKG_CONFIG:-}" \
@@ -177,8 +205,7 @@ pkgp_configure_sofort() {
RANLIB="${PKG_RANLIB}" \
"${PKG_CONFIGURE}" \
${PKG_CONFIGURE_ARGS:-} \
- ${PKG_CONFIGURE_ARGS_EXTRA:-} \
- ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG:-};
+ ${PKG_CONFIGURE_ARGS_EXTRA:-};
_ppcs_rc=$((${?} ? 1 : ${_ppcs_rc}));
for _ppcs_vname in ${_ppcs_vnames}; do
diff --git a/subr.pkg/pkg_install_make.subr b/subr.pkg/pkg_install_make.subr
index a3611b3..89c61ce 100644
--- a/subr.pkg/pkg_install_make.subr
+++ b/subr.pkg/pkg_install_make.subr
@@ -22,18 +22,49 @@ pkg_install_make() {
export MAKE="make LIBTOOL=${_pim_libtool}";
fi;
- rtl_run_cmdlineV ":" "${PKG_MAKE}" \
- ${PKG_MAKEFLAGS_INSTALL:-} \
- ${PKG_MAKEFLAGS_INSTALL_EXTRA:-} \
- AR="${PKG_AR}" \
- CC="${PKG_CC}" \
- RANLIB="${PKG_RANLIB}" \
- ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \
- ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \
- "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \
- "${PKG_INSTALL_TARGET:-install}" \
- ${_pim_subdir:+-C "${_pim_subdir}"};
- _pim_rc="${?}";
+ if [ "${PKG_MAKEFLAGS_INSTALL_LIST:+1}" = 1 ]; then
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ "${PKG_MAKEFLAGS_INSTALL_LIST}" \
+ "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST:-}" \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \
+ ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \
+ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \
+ "${PKG_INSTALL_TARGET:-install}" \
+ ${_pim_subdir:+-C "${_pim_subdir}"};
+ _pim_rc="${?}";
+ elif [ "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST:+1}" = 1 ]; then
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ ${PKG_MAKEFLAGS_INSTALL:-} \
+ "${PKG_MAKEFLAGS_INSTALL_EXTRA_LIST}" \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \
+ ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \
+ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \
+ "${PKG_INSTALL_TARGET:-install}" \
+ ${_pim_subdir:+-C "${_pim_subdir}"};
+ _pim_rc="${?}";
+ else
+ rtl_run_cmdlineV ":" "${PKG_MAKE}" \
+ ${PKG_MAKEFLAGS_INSTALL:-} \
+ ${PKG_MAKEFLAGS_INSTALL_EXTRA:-} \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
+ AR="${PKG_AR}" \
+ CC="${PKG_CC}" \
+ RANLIB="${PKG_RANLIB}" \
+ ${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"} \
+ ${_pim_libtool:+"LIBTOOL=${_pim_libtool}"} \
+ "${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/" \
+ "${PKG_INSTALL_TARGET:-install}" \
+ ${_pim_subdir:+-C "${_pim_subdir}"};
+ _pim_rc="${?}";
+ fi;
if [ "${#_pim_libtool}" -gt 0 ]; then
unset MAKE;
diff --git a/vars/texinfo.vars b/vars/texinfo.vars
index 38b20cf..08e73c1 100644
--- a/vars/texinfo.vars
+++ b/vars/texinfo.vars
@@ -6,11 +6,13 @@ pkg_texinfo_build_pre() {
if ! rtl_run_cmdlineV ":" "${PKG_MAKE}" \
${PKG_MAKEFLAGS_BUILD:-} \
${PKG_MAKEFLAGS_BUILD_EXTRA:-} \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
${PKG_LIBTOOL:+"LIBTOOL=${PKG_LIBTOOL}"} \
-C tools \
|| ! rtl_run_cmdlineV ":" "${PKG_MAKE}" \
${PKG_MAKEFLAGS_BUILD:-} \
${PKG_MAKEFLAGS_BUILD_EXTRA:-} \
+ ${PKG_MAKEFLAGS_PARALLELISE:-} \
${PKG_LIBTOOL:+"LIBTOOL=${PKG_LIBTOOL}"} \
LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib" \
LIBS="-ltinfo" \