From 7587f57cb234fd9b0222254f29c8e0eb096628b2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 May 2013 12:02:04 +0200 Subject: [PATCH] nfs-utils: update to 1.2.8; cross build support. --- srcpkgs/nfs-utils/template | 47 ++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 669416bb435..e4cb5e1f713 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,24 +1,45 @@ # Template file for 'nfs-utils' pkgname=nfs-utils -version=1.2.7 -revision=3 -build_style=gnu-configure -configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4 - --with-statedir=/var/lib/nfs --enable-libmount-mount - --without-tcp-wrappers --enable-ipv6 --sbindir=/usr/sbin" +version=1.2.8 +revision=1 short_desc="Network File System client utilities" maintainer="Juan RP " license="GPL-2" homepage="http://nfs.sourceforge.net" distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=d78768a0819c5eeed5e5abb6c4c9048962e9f8b9ef45451ea4db6aee38720121 +checksum=176889247046ffe5c5e7e7b5a357ed026654d83adabb2843b40752492c01e8f1 hostmakedepends="pkg-config" makedepends="libblkid-devel libmount-devel libtirpc-devel - librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel - libcap-devel mit-krb5-devel sqlite-devel" + librpcsecgss-devel>=0.19_3 libnfsidmap-devel>=0.25_3 keyutils-devel + libevent-devel device-mapper-devel libcap-devel mit-krb5-devel + libblkid-devel sqlite-devel rpcbind" + +do_configure() { + local _args + + _args="--with-statduser=nobody --enable-gss --enable-nfsv4 + --with-statedir=/var/lib/nfs --enable-libmount-mount + --with-gssglue --without-tcp-wrappers --enable-ipv6 + --sbindir=/usr/sbin" + + if [ "$CROSS_BUILD" ]; then + ./configure ${CONFIGURE_SHARED_ARGS} ${_args} \ + --with-tirpcinclude=$XBPS_CROSS_BASE/usr/include/tirpc \ + --with-krb5=$XBPS_CROSS_BASE \ + CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS" + else + ./configure ${CONFIGURE_SHARED_ARGS} ${_args} + fi +} + +do_build() { + make ${makejobs} +} + +do_install() { + make DESTDIR=${DESTDIR} install -post_install() { vmkdir usr/sbin mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin # conffiles @@ -26,8 +47,7 @@ post_install() { vinstall ${FILESDIR}/idmapd.conf 644 etc # systemd glue vmkdir usr/lib/systemd/system - install -m644 ${FILESDIR}/*.{service,mount} \ - ${DESTDIR}/usr/lib/systemd/system + install -m644 ${FILESDIR}/*.{service,mount} ${DESTDIR}/usr/lib/systemd/system } nfs-utils-server_package() { @@ -71,7 +91,6 @@ nfs-utils_package() { /var/lib/nfs/sm 0750 root root" depends="rpcbind" pkg_install() { - vmove etc - vmove usr + vmove all } }