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

xbps-src: make -D install work with bootstrap subpkgs.

Browse source
This commit is contained in:
Juan RP 2011-07-06 08:42:02 +02:00
parent f6683831cf
commit fa1c9ab96f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,8 +129,9 @@ install_src_phase()
spkgrev="${subpkg}-${version}" spkgrev="${subpkg}-${version}"
fi fi
check_installed_pkg ${spkgrev} check_installed_pkg ${spkgrev}
[ $? -eq 0 ] && continue if [ $? -eq 0 -a -z "$BOOTSTRAP_PKG_REBUILD" ]; then
continue
fi
msg_normal "'${sourcepkg}-$lver': preparing subpackage '${subpkg}'...\n" msg_normal "'${sourcepkg}-$lver': preparing subpackage '${subpkg}'...\n"
if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then
msg_error "Cannot find '${subpkg}' subpkg build template!\n" msg_error "Cannot find '${subpkg}' subpkg build template!\n"

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

@ -108,6 +108,7 @@ install_pkg()
# Install pkg into destdir. # Install pkg into destdir.
env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \ env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \
wrksrc=${wrksrc} \ wrksrc=${wrksrc} \
BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD \
${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 $?