vapier 14/06/03 16:54:59 Modified: daq-2.0.2.ebuild ChangeLog Log: Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross-compiling. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 net-libs/daq/daq-2.0.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild?r1=1.1&r2=1.2 Index: daq-2.0.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- daq-2.0.2.ebuild 3 Feb 2014 07:33:22 -0000 1.1 +++ daq-2.0.2.ebuild 3 Jun 2014 16:54:59 -0000 1.2 @@ -1,14 +1,15 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.1 2014/02/03 07:33:22 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.2 2014/06/03 16:54:59 vapier Exp $ EAPI="4" -inherit eutils multilib +inherit eutils multilib autotools DESCRIPTION="Data Acquisition library, for packet I/O" HOMEPAGE="http://www.snort.org/"; SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" @@ -22,10 +23,18 @@ ipq? ( dev-libs/libdnet >=net-firewall/iptables-1.4.10 net-libs/libnetfilter_queue )" - RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-parallel-grammar.patch #511892 + epatch "${FILESDIR}"/${P}-libpcap-check.patch + eautoreconf +} + src_configure() { + # We forced libpcap to 1.x, so we can set this cache var so + # cross-compiling doesn't break on us. + daq_cv_libpcap_version_1x=yes \ econf \ $(use_enable ipv6) \ $(use_enable pcap pcap-module) \ @@ -44,10 +53,10 @@ # Remove unneeded .la files rm \ - "${D}"usr/$(get_libdir)/daq/*.la \ - "${D}"usr/$(get_libdir)/libdaq*.la \ - "${D}"usr/$(get_libdir)/libsfbpf.la \ - || die + "${ED}"usr/$(get_libdir)/daq/*.la \ + "${ED}"usr/$(get_libdir)/libdaq*.la \ + "${ED}"usr/$(get_libdir)/libsfbpf.la \ + || die # If not using static-libs don't install the static libraries # This has been bugged upstream 1.26 net-libs/daq/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/ChangeLog?rev=1.26&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/ChangeLog?rev=1.26&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/ChangeLog?r1=1.25&r2=1.26 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ChangeLog 3 Feb 2014 07:33:22 -0000 1.25 +++ ChangeLog 3 Jun 2014 16:54:59 -0000 1.26 @@ -1,6 +1,12 @@ # ChangeLog for net-libs/daq # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.25 2014/02/03 07:33:22 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.26 2014/06/03 16:54:59 vapier Exp $ + + 03 Jun 2014; Mike Frysinger <[email protected]> + +files/daq-2.0.2-libpcap-check.patch, +files/daq-2.0.2-parallel-grammar.patch, + daq-2.0.2.ebuild: + Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross- + compiling. *daq-2.0.2 (03 Feb 2014)
