From 92c83228cb7d28f9a85f3eb78ae3b3965f360e24 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 Feb 2013 15:30:01 +0100 Subject: [PATCH] coreutils: split out docs into -doc subpkg; add cross build support. --- srcpkgs/coreutils-doc | 1 + srcpkgs/coreutils/coreutils-doc.template | 10 +++++ srcpkgs/coreutils/template | 54 +++++++++++++++++++++--- 3 files changed, 60 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/coreutils-doc create mode 100644 srcpkgs/coreutils/coreutils-doc.template diff --git a/srcpkgs/coreutils-doc b/srcpkgs/coreutils-doc new file mode 120000 index 00000000000..a4b710b1789 --- /dev/null +++ b/srcpkgs/coreutils-doc @@ -0,0 +1 @@ +coreutils \ No newline at end of file diff --git a/srcpkgs/coreutils/coreutils-doc.template b/srcpkgs/coreutils/coreutils-doc.template new file mode 100644 index 00000000000..fec630bbbec --- /dev/null +++ b/srcpkgs/coreutils/coreutils-doc.template @@ -0,0 +1,10 @@ +# Template file for 'coreutils-doc'. +# +noarch=yes +short_desc="${short_desc} -- documentation files" +replaces="coreutils<8.20_4" + +do_install() { + vmove usr/share/info usr/share + vmove usr/share/man usr/share +} diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index e261d8d9543..2167a8441ae 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -1,14 +1,58 @@ # Template file for 'coreutils' pkgname=coreutils version=8.20 -revision=3 -conflicts="chroot-coreutils>=0" -build_style=gnu-configure -configure_args="--enable-install-program=hostname" -makedepends="perl gmp-devel acl-devel libcap-devel" +revision=4 short_desc="The GNU core utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/coreutils" license="GPL-3" distfiles="http://ftp.gnu.org/gnu/coreutils/${pkgname}-${version}.tar.xz" checksum=dbcb798764827a0f74be738662ecb516705cf520330cd3d7b2640fdffa499eb2 + +subpackages="coreutils-doc" +conflicts="chroot-coreutils>=0" +makedepends="perl gmp-devel acl-devel libcap-devel" +depends="coreutils-doc-${version}_${revision}" + +if [ -n "$XBPS_CROSS_TRIPLET" ]; then + unset subpackages + makedepends="perl" + crossmakedepends="gmp-devel acl-devel libcap-devel" +fi + +do_configure() { + if [ -n "$XBPS_CROSS_TRIPLET" ]; then + _confargs="fu_cv_sys_stat_statfs2_bsize=yes \ + gl_cv_func_working_mkstemp=yes + gl_cv_func_working_acl_get_file=yes" + fi + ./configure ${CONFIGURE_SHARED_ARGS} \ + --enable-install-program=hostname \ + --disable-rpath ${_confargs} +} + +do_build() { + if [ -n "$XBPS_CROSS_TRIPLET" ]; then + cp Makefile Makefile.orig + sed '/src_make_prime_list/d' Makefile.orig > Makefile + depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ + gcc -std=gnu99 -I. -I./lib -Ilib -I./lib -Isrc -I./src \ + -fdiagnostics-show-option -funit-at-a-time -g -O2 -MT \ + src/make-prime-list.o -MD -MP -MF $depbase.Tpo -c -o src/make-prime-list.o \ + src/make-prime-list.c && + mv -f $depbase.Tpo $depbase.Po + gcc -std=gnu99 -fdiagnostics-show-option -funit-at-a-time -g -O2 \ + -Wl,--as-needed -o src/make-prime-list src/make-prime-list.o + cp Makefile Makefile.bak + sed -e '/hostname.1/d' Makefile.bak > Makefile + fi + make ${makejobs} +} + +do_install() { + make DESTDIR=${DESTDIR} install + + if [ -n "$XBPS_CROSS_TRIPLET" ]; then + rm -rf ${DESTDIR}/usr/share/info + fi +}