From 96ab463744a6dfb883eae9e943a10df34aa9d4e4 Mon Sep 17 00:00:00 2001 From: mischief Date: Tue, 3 Mar 2015 17:04:01 -0800 Subject: [PATCH] net-libs/libtirpc: bump to 0.2.5 --- .../files/libtirpc-0.2.5-stdarg.patch | 29 +++++++++++++++ ...-0.2.4-r1.ebuild => libtirpc-0.2.5.ebuild} | 37 +++++++++++++------ 2 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch rename sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/{libtirpc-0.2.4-r1.ebuild => libtirpc-0.2.5.ebuild} (59%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch new file mode 100644 index 0000000000..8006de39e4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch @@ -0,0 +1,29 @@ +From d26607bade0893fe8652e1a0983f9fae59c64649 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 12 Aug 2014 03:11:41 -0400 +Subject: [PATCH libtirpc] include stdarg.h when used + +The debug.h header uses va_list but doesn't include stdarg.h which +can lead to random build failures. + +Signed-off-by: Mike Frysinger +--- + src/debug.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/debug.h b/src/debug.h +index afc8d57..c971ac3 100644 +--- a/src/debug.h ++++ b/src/debug.h +@@ -21,6 +21,8 @@ + + #ifndef _DEBUG_H + #define _DEBUG_H ++ ++#include + #include + + extern int libtirpc_debug_level; +-- +2.0.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-0.2.5.ebuild similarity index 59% rename from sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-0.2.5.ebuild index 3d7125ad6d..abab4ab2b3 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-0.2.5.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.4-r1.ebuild,v 1.6 2014/08/11 13:37:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.5.ebuild,v 1.11 2015/02/27 11:27:58 ago Exp $ EAPI="4" -inherit toolchain-funcs +inherit multilib-minimal toolchain-funcs DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" HOMEPAGE="http://libtirpc.sourceforge.net/" @@ -16,35 +16,50 @@ SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" IUSE="ipv6 kerberos static-libs" -RDEPEND="kerberos? ( virtual/krb5 )" +RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} app-arch/xz-utils - virtual/pkgconfig" + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +RDEPEND="${RDEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" src_unpack() { unpack ${A} cp -r tirpc "${S}"/ || die } -src_configure() { +src_prepare() { + epatch "${FILESDIR}"/${P}-stdarg.patch +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ econf \ $(use_enable ipv6) \ $(use_enable kerberos gssapi) \ $(use_enable static-libs static) } -src_install() { +multilib_src_install() { default + + # libtirpc replaces rpc support in glibc, so we need it in / + multilib_is_native_abi && gen_usr_ldscript -a tirpc +} + +multilib_src_install_all() { + einstalldocs + insinto /etc doins doc/netconfig insinto /usr/include/tirpc doins -r "${WORKDIR}"/tirpc/* - # libtirpc replaces rpc support in glibc, so we need it in / - gen_usr_ldscript -a tirpc - # makes sure that the linking order for nfs-utils is proper, as # libtool would inject a libgssglue dependency in the list. - use static-libs || find "${ED}" -name '*.la' -delete + use static-libs || prune_libtool_files }