Added new var "build_wrksrc" for use in templates.
This var sets a relative path to $wrksrc that is used to configure/build/install a package. --HG-- extra : convert_revision : 690f4d435f3d4e6a9228f7f5f09ecf8b490a273a
This commit is contained in:
parent
dd01fbf43c
commit
9b74f9ebc8
4 changed files with 7 additions and 3 deletions
|
@ -43,7 +43,8 @@ build_src_phase()
|
|||
|
||||
[ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]"
|
||||
|
||||
cd $wrksrc || exit 1
|
||||
cd $wrksrc || return 1
|
||||
[ -n "$build_wrksrc" ] && cd $build_wrksrc || return 1
|
||||
|
||||
[ -n "$revision" ] && pkg="${pkg}_${revision}"
|
||||
|
||||
|
|
|
@ -68,7 +68,8 @@ configure_src_phase()
|
|||
|
||||
[ -z "$configure_script" ] && configure_script="./configure"
|
||||
|
||||
cd $wrksrc || exit 1
|
||||
cd $wrksrc || return 1
|
||||
[ -n "$build_wrksrc" ] && cd $build_wrksrc || return 1
|
||||
|
||||
. $XBPS_SHUTILSDIR/buildvars_funcs.sh
|
||||
set_build_vars
|
||||
|
|
|
@ -71,6 +71,8 @@ install_src_phase()
|
|||
|
||||
saved_wrksrc=$wrksrc
|
||||
cd $wrksrc || msg_error "can't change cwd to wrksrc!"
|
||||
[ -n "$build_wrksrc" ] && cd $build_wrksrc \
|
||||
|| msg_error "can't change cwd to build_wrksrc!"
|
||||
|
||||
# Run pre_install func.
|
||||
run_func pre_install || msg_error "pre_install stage failed!"
|
||||
|
|
|
@ -75,7 +75,7 @@ reset_tmpl_vars()
|
|||
only_for_archs conf_files keep_libtool_archives \
|
||||
noarch subpackages sourcepkg gtk_iconcache_dirs \
|
||||
abi_depends api_depends triggers openrc_services \
|
||||
replaces system_accounts \
|
||||
replaces system_accounts build_wrksrc \
|
||||
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
|
||||
XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
|
||||
SRCPKGDESTDIR PATCHESDIR"
|
||||
|
|
Loading…
Reference in a new issue