jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: make makejobs work again for tmpls with custom do_build().

Browse source
This commit is contained in:
Juan RP 2011-10-25 09:59:04 +02:00
parent 917c78a25a
commit 0bfacff19e
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xbps-src/helpers/gnu-makefile.sh
View file

@ -5,9 +5,6 @@ do_build() {
if [ -z "$make_cmd" ]; then
make_cmd=make
fi
if [ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ]; then
makejobs="-j$XBPS_MAKEJOBS"
fi
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
}

4
xbps-src/shutils/build_funcs.sh
View file

@ -43,6 +43,10 @@ build_src_phase()
cd $build_wrksrc || return 1
fi
if [ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ]; then
makejobs="-j$XBPS_MAKEJOBS"
fi
# Run pre_build func.
if [ ! -f $XBPS_PRE_BUILD_DONE ]; then
run_func pre_build

2
xbps-src/shutils/tmpl_funcs.sh.in
View file

@ -104,7 +104,7 @@ reset_tmpl_vars()
ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \
gconf_entries gconf_schemas stow_copy stow_copy_files \
pycompile_dirs pycompile_module systemd_services \
homepage license kernel_hooks_version \
homepage license kernel_hooks_version makejobs \
SUBPKG XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
SRCPKGDESTDIR PATCHESDIR CFLAGS CXXFLAGS CPPFLAGS \