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

xbps-src-doinst-helper is run via fakeroot so set build vars before and after!

Browse source
This commit is contained in:
Juan RP 2010-05-10 11:17:58 +02:00
parent 823f820827
commit 2850e6ed79
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xbps-src/libexec/xbps-src-doinst-helper.sh.in
View file

@ -88,8 +88,6 @@ install_src_phase()
|| msg_error "can't change cwd to build_wrksrc!" || msg_error "can't change cwd to build_wrksrc!"
fi fi
set_build_vars
# Run pre_install func. # Run pre_install func.
run_func pre_install 2>${wrksrc}/.xbps_pre_install.log run_func pre_install 2>${wrksrc}/.xbps_pre_install.log
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -168,14 +166,12 @@ install_src_phase()
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template . $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
pkgname=${subpkg} pkgname=${subpkg}
set_tmpl_common_vars set_tmpl_common_vars
set_build_vars
run_func do_install 2>${wrksrc}/.xbps_do_install_${pkgname}.log run_func do_install 2>${wrksrc}/.xbps_do_install_${pkgname}.log
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
msg_red "$pkgname: do_install() failed:" msg_red "$pkgname: do_install() failed:"
cat ${wrksrc}/.xbps_do_install_${pkgname}.log cat ${wrksrc}/.xbps_do_install_${pkgname}.log
exit 1 exit 1
fi fi
unset_build_vars
done done
# #
@ -185,8 +181,6 @@ install_src_phase()
rm -rf $saved_wrksrc && \ rm -rf $saved_wrksrc && \
msg_normal "Removed $sourcepkg-$lver build directory." msg_normal "Removed $sourcepkg-$lver build directory."
fi fi
unset_build_vars
} }
# #

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

@ -96,11 +96,13 @@ install_pkg()
fi fi
# Install pkg into destdir. # Install pkg into destdir.
set_build_vars
env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \ env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \
dontrm_builddir=${dontrm_builddir} \ dontrm_builddir=${dontrm_builddir} \
${fakeroot_cmd} ${fakeroot_cmd_args} \ ${fakeroot_cmd} ${fakeroot_cmd_args} \
@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-doinst-helper \ @@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-doinst-helper \
${curpkgn} || return $? ${curpkgn} || return $?
unset_build_vars
# Always write metadata to package's destdir. # Always write metadata to package's destdir.
. $XBPS_SHUTILSDIR/metadata.sh . $XBPS_SHUTILSDIR/metadata.sh