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

Simplify and improve list_pkg_files() and configure_src_phase().

Browse source 
--HG--
extra : convert_revision : 512bf3f7499ec8deff05af56cf5a6b44ee6e0ab5
This commit is contained in:
Juan RP 2008-10-28 06:02:52 +01:00
parent f365ce8bce
commit dff230ebcb
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xbps.sh
View file

@ -738,11 +738,12 @@ configure_src_phase()
_prefix= _prefix=
fi fi
cd $wrksrc || exit 1
# #
# Packages using GNU autoconf # Packages using GNU autoconf
# #
if [ "$build_style" = "gnu_configure" ]; then if [ "$build_style" = "gnu_configure" ]; then
cd $wrksrc || exit 1
${configure_script} \ ${configure_script} \
--host=${xbps_machine}-linux-gnu \ --host=${xbps_machine}-linux-gnu \
--build=${xbps_machine}-linux-gnu \ --build=${xbps_machine}-linux-gnu \
@ -750,12 +751,10 @@ configure_src_phase()
--infodir=$XBPS_DESTDIR/$pkgname-$version/usr/share/info \ --infodir=$XBPS_DESTDIR/$pkgname-$version/usr/share/info \
--mandir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man \ --mandir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man \
${configure_args} ${configure_args}
# #
# Packages using propietary configure scripts. # Packages using propietary configure scripts.
# #
elif [ "$build_style" = "configure" ]; then elif [ "$build_style" = "configure" ]; then
cd $wrksrc || exit 1
${configure_script} ${configure_args} ${configure_script} ${configure_args}
# #
# Packages that are perl modules and use Makefile.PL files. # Packages that are perl modules and use Makefile.PL files.
@ -771,8 +770,7 @@ configure_src_phase()
# #
elif [ "$build_style" = "bsd_makefile" -o \ elif [ "$build_style" = "bsd_makefile" -o \
"$build_style" = "gnu_makefile" ]; then "$build_style" = "gnu_makefile" ]; then
:
cd $wrksrc || exit 1
# #
# Unknown build_style type won't work :-) # Unknown build_style type won't work :-)
# #
@ -1221,7 +1219,7 @@ install_pkg()
fi fi
# #
# If we are being invoked via install-chroot, reread config file # If we are being invoked through the chroot, re-read config file
# to get correct stuff. # to get correct stuff.
# #
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
@ -1326,7 +1324,7 @@ list_pkgs()
list_pkg_files() list_pkg_files()
{ {
local pkg="$1" local pkg="$1"
local f= local f="$XBPS_DESTDIR/$pkg/.xbps-filelist"
if [ -z $pkg ]; then if [ -z $pkg ]; then
echo "*** ERROR: unexistent package, aborting ***" echo "*** ERROR: unexistent package, aborting ***"
@ -1338,11 +1336,7 @@ list_pkg_files()
exit 1 exit 1
fi fi
for f in $(find $XBPS_DESTDIR/$pkg -print | sort -u); do cat $f|sort -u
[ $f = $XBPS_DESTDIR/$pkg ] && continue
f=$(echo $f|sed 's/.xbps-filelist//g')
echo "${f##$XBPS_DESTDIR/$pkg/}"
done
} }
# #
@ -1391,6 +1385,7 @@ stow_pkg()
{ {
local pkg="$1" local pkg="$1"
local i= local i=
local flist="$XBPS_BUILDDIR/.xbps-filelist-$pkgname-$version"
[ -z "$pkg" ] && return 2 [ -z "$pkg" ] && return 2
@ -1407,12 +1402,10 @@ stow_pkg()
fi fi
cd $XBPS_DESTDIR/$pkgname-$version || exit 1 cd $XBPS_DESTDIR/$pkgname-$version || exit 1
find . > $XBPS_MASTERDIR/.xbps-filelist-$pkgname-$version find . > $flist
sed -i -e "s|^.$||g;s|^./||g" \ sed -i -e "s|^.$||g;s|^./||g" $flist
$XBPS_MASTERDIR/.xbps-filelist-$pkgname-$version
cp -ar . $XBPS_MASTERDIR cp -ar . $XBPS_MASTERDIR
mv -f $XBPS_MASTERDIR/.xbps-filelist-$pkgname-$version \ mv -f $flist $XBPS_DESTDIR/$pkgname-$version/.xbps-filelist
$XBPS_DESTDIR/$pkgname-$version/.xbps-filelist
register_pkg_handler register $pkgname $version register_pkg_handler register $pkgname $version