diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-09-01 23:10:15 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-09-01 23:10:15 +0000 |
| commit | ab5ffcb49f062cd21cc829db9e5a36ccbdc5b6e7 (patch) | |
| tree | 0529f89c2f7da9c504a943c94627bb3be974afe9 /net-fs | |
| parent | version bump , bug #381463 tracks fixes since openrc-0.9.0. (diff) | |
| download | gentoo-2-ab5ffcb49f062cd21cc829db9e5a36ccbdc5b6e7.tar.gz gentoo-2-ab5ffcb49f062cd21cc829db9e5a36ccbdc5b6e7.tar.bz2 gentoo-2-ab5ffcb49f062cd21cc829db9e5a36ccbdc5b6e7.zip | |
Fix build with USE=-nfsv4, by importing two (folded) patches from git.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch | 24 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.2.4.ebuild | 6 |
3 files changed, 33 insertions, 3 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 59a8e3210aa6..6823c3b7fb33 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.185 2011/09/01 15:19:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.186 2011/09/01 23:10:15 flameeyes Exp $ + + 01 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> nfs-utils-1.2.4.ebuild, + +files/nfs-utils-1.2.4-conditional.patch: + Fix build with USE=-nfsv4, by importing two (folded) patches from git. *nfs-utils-1.2.4 (01 Sep 2011) diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch new file mode 100644 index 000000000000..b82b5b23e8fa --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch @@ -0,0 +1,24 @@ +diff --git a/configure.ac b/configure.ac +index ca12f9e..593808c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -256,9 +256,6 @@ if test "$enable_nfsv4" = yes; then + dnl check for nfsidmap libraries and headers + AC_LIBNFSIDMAP + +- dnl enable nfsidmap when its support by libnfsidmap +- AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) +- + dnl check for the keyutils libraries and headers + AC_KEYUTILS + +@@ -268,6 +265,9 @@ if test "$enable_nfsv4" = yes; then + AC_RPCSEC_VERSION + fi + fi ++dnl enable nfsidmap when its support by libnfsidmap ++AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) ++ + + if test "$knfsd_cv_glibc2" = no; then + AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild index 7ba8bbf98550..b15612e137e1 100644 --- a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.1 2011/09/01 15:19:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.2 2011/09/01 23:10:15 flameeyes Exp $ EAPI="2" -inherit eutils flag-o-matic multilib +inherit eutils flag-o-matic multilib autotools DESCRIPTION="NFS client and server daemons" HOMEPAGE="http://linux-nfs.org/" @@ -44,6 +44,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-xlog.patch epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-skip-dir.patch + epatch "${FILESDIR}"/${PN}-1.2.4-conditional.patch + eautoreconf } src_configure() { |