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

Set and unset compilation vars in all phases not just configure.

Browse source 
--HG--
extra : convert_revision : 8260a0608d8e90720c27139c76b4bf70830da12b
This commit is contained in:
Juan RP 2008-10-22 04:08:46 +02:00
parent 3b5c4b506d
commit e13b08218a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xbps.sh
View file

@ -769,6 +769,8 @@ configure_src_phase()
# Override libtool scripts if necessary # Override libtool scripts if necessary
fixup_tmpl_libtool fixup_tmpl_libtool
unset_build_vars
$touch_cmd -f $XBPS_CONFIGURE_DONE $touch_cmd -f $XBPS_CONFIGURE_DONE
} }
@ -820,6 +822,7 @@ build_src_phase()
export "$f" export "$f"
done done
set_build_vars
# #
# Build package via make. # Build package via make.
# #
@ -840,6 +843,8 @@ build_src_phase()
${run_stuff_before_install_cmd} ${run_stuff_before_install_cmd}
unset rbif unset rbif
unset_build_vars
$touch_cmd -f $XBPS_BUILD_DONE $touch_cmd -f $XBPS_BUILD_DONE
} }
@ -855,6 +860,7 @@ install_src_phase()
if [ -z "$make_install_target" ]; then if [ -z "$make_install_target" ]; then
make_install_target="install prefix=$XBPS_DESTDIR/$pkgname-$version" make_install_target="install prefix=$XBPS_DESTDIR/$pkgname-$version"
make_install_target="$make_install_target sysconfdir=$XBPS_DESTDIR/$pkgname-$version/etc"
fi fi
[ -z "$make_cmd" ] && make_cmd=/usr/bin/make [ -z "$make_cmd" ] && make_cmd=/usr/bin/make
@ -873,6 +879,7 @@ install_src_phase()
echo "=> Running install phase for: $pkgname-$version." echo "=> Running install phase for: $pkgname-$version."
set_build_vars
# #
# Install package via make. # Install package via make.
# #