From b0714d0f11c1579d3a64d528426a90af6127f476 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Thu, 19 Jul 2012 10:44:13 +0000 Subject: Patch configure.ac to search for arpg in glibc or libargp, bug #292191 (Portage version: 2.1.10.65/cvs/Linux x86_64) --- sys-apps/rng-tools/ChangeLog | 10 +++++-- sys-apps/rng-tools/files/test-for-argp.patch | 43 ++++++++++++++++++++++++++++ sys-apps/rng-tools/rng-tools-3-r1.ebuild | 30 +++++++++++++++++++ 3 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 sys-apps/rng-tools/files/test-for-argp.patch create mode 100644 sys-apps/rng-tools/rng-tools-3-r1.ebuild diff --git a/sys-apps/rng-tools/ChangeLog b/sys-apps/rng-tools/ChangeLog index be86146bd29e..048974e0a46b 100644 --- a/sys-apps/rng-tools/ChangeLog +++ b/sys-apps/rng-tools/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/rng-tools -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.30 2010/11/08 12:18:52 nelchael Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/ChangeLog,v 1.31 2012/07/19 10:44:13 blueness Exp $ + +*rng-tools-3-r1 (19 Jul 2012) + + 19 Jul 2012; Anthony G. Basile +rng-tools-3-r1.ebuild, + +files/test-for-argp.patch: + Patch configure.ac to search for arpg in glibc or libargp, bug #292191 *rng-tools-3 (08 Nov 2010) diff --git a/sys-apps/rng-tools/files/test-for-argp.patch b/sys-apps/rng-tools/files/test-for-argp.patch new file mode 100644 index 000000000000..129a522e5686 --- /dev/null +++ b/sys-apps/rng-tools/files/test-for-argp.patch @@ -0,0 +1,43 @@ +On glibc systems, argp is provided by libc. However, on +uclibc and other systems which lack argp in their C library, +argp might be provided by a stand alone library, libargp. +This patch adds tests to the build system to find who provides +argp. + +X-Gentoo-Bug: 292191 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191 +Reported-by: Ed Wildgoose +Signed-off-by: Anthony G. Basile + + +--- configure.ac.orig 2012-05-26 22:45:42.753478198 +0000 ++++ configure.ac 2012-05-27 00:36:23.175844081 +0000 +@@ -47,6 +47,28 @@ + dnl Checks for optional library functions + dnl ------------------------------------- + ++dnl First check if we have argp available from libc ++AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [#include ], ++ [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;] ++ )], ++ [libc_has_argp="true"], ++ [libc_has_argp="false"] ++) ++ ++dnl If libc doesn't provide argp, then test for libargp ++if test "$libc_has_argp" = "false" ; then ++ AC_MSG_WARN("libc does not have argp") ++ AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) ++ ++ if test "$have_argp" = "false"; then ++ AC_MSG_ERROR("no libargp found") ++ else ++ LIBS+=" -largp" ++ fi ++fi ++ + dnl ----------------- + dnl Configure options + dnl ----------------- diff --git a/sys-apps/rng-tools/rng-tools-3-r1.ebuild b/sys-apps/rng-tools/rng-tools-3-r1.ebuild new file mode 100644 index 000000000000..2fbc435488f0 --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-3-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/rng-tools/rng-tools-3-r1.ebuild,v 1.1 2012/07/19 10:44:13 blueness Exp $ + +EAPI=2 +inherit eutils autotools + +DESCRIPTION="Daemon to use hardware random number generators." +HOMEPAGE="http://gkernel.sourceforge.net/" +SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86" +IUSE="" +DEPEND="" +RDEPEND="" + +src_prepare() { + echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am + epatch "${FILESDIR}"/test-for-argp.patch + eautoreconf +} + +src_install() { + make DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog + newinitd "${FILESDIR}/rngd-initd-${PV}" rngd + newconfd "${FILESDIR}/rngd-confd-${PV}" rngd +} -- cgit v1.2.3-65-gdbad