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

Added new var "build_wrksrc" for use in templates.

Browse source 
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:
Juan RP 2009-12-30 22:16:33 +01:00
parent dd01fbf43c
commit 9b74f9ebc8
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,8 @@ build_src_phase()
[ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]" [ ! -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}" [ -n "$revision" ] && pkg="${pkg}_${revision}"

3
xbps-src/shutils/configure_funcs.sh
View file

@ -68,7 +68,8 @@ configure_src_phase()
[ -z "$configure_script" ] && configure_script="./configure" [ -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 . $XBPS_SHUTILSDIR/buildvars_funcs.sh
set_build_vars set_build_vars

2
xbps-src/shutils/install_funcs.sh
View file

@ -71,6 +71,8 @@ install_src_phase()
saved_wrksrc=$wrksrc saved_wrksrc=$wrksrc
cd $wrksrc || msg_error "can't change cwd to 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 pre_install func.
run_func pre_install || msg_error "pre_install stage failed!" run_func pre_install || msg_error "pre_install stage failed!"

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

@ -75,7 +75,7 @@ reset_tmpl_vars()
only_for_archs conf_files keep_libtool_archives \ only_for_archs conf_files keep_libtool_archives \
noarch subpackages sourcepkg gtk_iconcache_dirs \ noarch subpackages sourcepkg gtk_iconcache_dirs \
abi_depends api_depends triggers openrc_services \ abi_depends api_depends triggers openrc_services \
replaces system_accounts \ replaces system_accounts build_wrksrc \
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \ XBPS_BUILD_DONE XBPS_INSTALL_DONE FILESDIR DESTDIR \
SRCPKGDESTDIR PATCHESDIR" SRCPKGDESTDIR PATCHESDIR"