From 789133ebdc361f379932d6096c7d8bf421127a61 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 10 Nov 2014 14:46:00 +0100 Subject: [PATCH] coreutils: bootstrap=yes; replaces chroot-coreutils. --- srcpkgs/coreutils/template | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index b2bcf34afcf..1cad370547e 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -1,11 +1,11 @@ # Template file for 'coreutils' pkgname=coreutils version=8.23 -revision=1 -hostmakedepends="perl" +revision=2 +bootstrap=yes makedepends="gmp-devel acl-devel libcap-devel" depends="coreutils-doc-${version}_${revision}" -conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3" +replaces="chroot-coreutils>=0" short_desc="The GNU core utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/coreutils" @@ -13,6 +13,14 @@ license="GPL-3" distfiles="http://ftp.gnu.org/gnu/coreutils/${pkgname}-${version}.tar.xz" checksum=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d +if [ "$CHROOT_READY" ]; then + hostmakedepends="perl" +fi + +if [ -z "$CROSS_BUILD" ]; then + subpackages="coreutils-doc" +fi + do_configure() { if [ "$CROSS_BUILD" ]; then configure_args+=" fu_cv_sys_stat_statfs2_bsize=yes @@ -28,7 +36,6 @@ do_configure() { --enable-no-install-program=kill,uptime \ --disable-rpath } - do_build() { if [ "$CROSS_BUILD" ]; then cp Makefile Makefile.orig @@ -46,7 +53,6 @@ do_build() { fi make ${makejobs} } - do_install() { make DESTDIR=${DESTDIR} install @@ -55,14 +61,12 @@ do_install() { fi } -if [ -z "$CROSS_BUILD" ]; then - coreutils-doc_package() { - noarch=yes - short_desc+=" - documentation files" - replaces="coreutils<8.20_4" - pkg_install() { - vmove usr/share/info - vmove usr/share/man - } +coreutils-doc_package() { + noarch=yes + short_desc+=" - documentation files" + replaces="coreutils<8.20_4" + pkg_install() { + vmove usr/share/info + vmove usr/share/man } -fi +}