teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kill $base_package, it was only used by dash after all.

Browse Source 
--HG--
extra : convert_revision : e7ac14b1535f716dec259fc208343b3f4b6bb75f
This commit is contained in:
Juan RP 2009-03-14 06:11:52 +01:00
parent d9521b6bb1
commit de411515cc
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shutils/configure_funcs.sh
View File

@ -68,13 +68,6 @@ configure_src_phase()
[ -z "$configure_script" ] && configure_script="./configure" [ -z "$configure_script" ] && configure_script="./configure"
local _prefix=
if [ -z "$base_package" ]; then
_prefix=/usr
else
_prefix=
fi
cd $wrksrc || exit 1 cd $wrksrc || exit 1
. $XBPS_SHUTILSDIR/buildvars_funcs.sh . $XBPS_SHUTILSDIR/buildvars_funcs.sh
@ -92,7 +85,7 @@ configure_src_phase()
mandir=/usr/share/man mandir=/usr/share/man
fi fi
${configure_script} \ ${configure_script} \
--prefix=${_prefix} --sysconfdir=/etc \ --prefix=/usr --sysconfdir=/etc \
--infodir=${infodir} --mandir=${mandir} \ --infodir=${infodir} --mandir=${mandir} \
${configure_args} ${configure_args}
# #

2
shutils/tmpl_funcs.sh
View File

@ -61,7 +61,7 @@ reset_tmpl_vars()
local TMPL_VARS="pkgname distfiles configure_args configure_env \ local TMPL_VARS="pkgname distfiles configure_args configure_env \
make_build_args make_install_args build_style \ make_build_args make_install_args build_style \
short_desc maintainer long_desc checksum wrksrc \ short_desc maintainer long_desc checksum wrksrc \
patch_files make_cmd base_package base_chroot \ patch_files make_cmd base_chroot \
make_build_target configure_script \ make_build_target configure_script \
pre_configure pre_build pre_install post_install \ pre_configure pre_build pre_install post_install \
make_install_target version \ make_install_target version \

7
templates/dash/template
View File

@ -4,8 +4,9 @@ version=0.5.4
distfiles=" distfiles="
http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz" http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
build_style=gnu_configure build_style=gnu_configure
configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin" configure_args="--prefix= --mandir=/usr/share/man"
configure_env="LANG=C" configure_env="LANG=C"
make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
short_desc="POSIX-compliant Unix shell, much smaller than GNU bash" short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623 checksum=a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623
@ -17,12 +18,10 @@ long_desc="
(ash). It was ported to Linux by Herbert Xu in early 1997. It was renamed to (ash). It was ported to Linux by Herbert Xu in early 1997. It was renamed to
dash in 2002." dash in 2002."
base_package=yes
base_chroot=yes base_chroot=yes
Add_dependency run glibc Add_dependency run glibc
post_install() post_install()
{ {
cd $XBPS_DESTDIR/$pkgname-$version/bin && ln -s dash sh cd ${DESTDIR}/bin && ln -s dash sh
} }