Rework how $revision is used. Works much better in all cases.
$version is not modified anymore. --HG-- extra : convert_revision : a83408f47e22db2f34cd33d6d47eb2f045ae2758
This commit is contained in:
parent
e0d52c9d11
commit
75bd88afc6
10 changed files with 106 additions and 60 deletions
|
@ -29,8 +29,7 @@
|
|||
#
|
||||
configure_src_phase()
|
||||
{
|
||||
local pkg="$1"
|
||||
local f=
|
||||
local f lver pkg="$1"
|
||||
|
||||
[ -z $pkg ] && [ -z $pkgname ] && return 1
|
||||
|
||||
|
@ -50,6 +49,12 @@ configure_src_phase()
|
|||
"$build_style" = "only-install" -o \
|
||||
"$build_style" = "custom-install" ] && return 0
|
||||
|
||||
if [ -n "$revision" ]; then
|
||||
lver="${version}_${revision}"
|
||||
else
|
||||
lver="${version}"
|
||||
fi
|
||||
|
||||
# cross compilation vars.
|
||||
if [ -n "$cross_compiler" ]; then
|
||||
. $XBPS_HELPERSDIR/cross-compilation.sh
|
||||
|
@ -64,7 +69,7 @@ configure_src_phase()
|
|||
export "$f"
|
||||
done
|
||||
|
||||
msg_normal "Running configure phase for $pkgname-$version."
|
||||
msg_normal "Running configure phase for $pkgname-$lver."
|
||||
|
||||
[ -z "$configure_script" ] && configure_script="./configure"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue