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

xbps-src: always check if build_style is set before checking its value.

Browse source
This commit is contained in:
Juan RP 2011-10-24 20:18:16 +02:00
parent 2fe805e161
commit 02278e964c
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xbps-src/shutils/build_funcs.sh
View file

@ -34,7 +34,7 @@ build_src_phase()
[ -z $pkgname -o -z $version ] && return 1
# Skip this phase for meta-template style builds.
[ "$build_style" = "meta-template" ] && return 0
[ -m "$build_style" -a "$build_style" = "meta-template" ] && return 0
[ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]\n"

2
xbps-src/shutils/configure_funcs.sh
View file

@ -35,7 +35,7 @@ configure_src_phase()
[ -z $pkgname ] && return 1
# Skip this phase for meta-template style builds.
[ "$build_style" = "meta-template" ] && return 0
[ -n "$build_style" -a "$build_style" = "meta-template" ] && return 0
cd $wrksrc || msg_error "unexistent build directory [$wrksrc].\n"

2
xbps-src/shutils/fetch_funcs.sh
View file

@ -55,7 +55,7 @@ fetch_distfiles()
#
# There's nothing of interest if we are a meta template.
#
[ "$build_style" = "meta-template" ] && return 0
[ -n "$build_style" -a "$build_style" = "meta-template" ] && return 0
[ -f "$XBPS_FETCH_DONE" ] && return 0

2
xbps-src/shutils/metadata.sh
View file

@ -56,7 +56,7 @@ xbps_write_metadata_pkg()
xbps_write_metadata_pkg_real
done
if [ "$build_style" = "meta-template" -a -z "${run_depends}" ]; then
if [ -n "$build_style" -a "$build_style" = "meta-template" -a -z "${run_depends}" ]; then
for spkg in ${subpackages}; do
if [ -n "${revision}" ]; then
spkgrev="${spkg}-${version}_$revision"

2
xbps-src/shutils/stow_funcs.sh
View file

@ -75,7 +75,7 @@ stow_pkg_real()
msg_error "cannot stow $pkgname! (permission denied)\n"
fi
if [ "$build_style" = "meta-template" ]; then
if [ -n "$build_style" -a "$build_style" = "meta-template" ]; then
[ ! -d ${DESTDIR} ] && mkdir -p ${DESTDIR}
fi

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

@ -245,7 +245,7 @@ prepare_tmpl()
REQ_VARS="pkgname version short_desc long_desc"
if [ "$build_style" = "meta-template" ]; then
if [ -n "$build_style" -a "$build_style" = "meta-template" ]; then
nofetch=yes
noextract=yes
fi