| 1 |
vapier 14/06/03 16:54:59 |
| 2 |
|
| 3 |
Modified: daq-2.0.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross-compiling. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-libs/daq/daq-2.0.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: daq-2.0.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- daq-2.0.2.ebuild 3 Feb 2014 07:33:22 -0000 1.1 |
| 23 |
+++ daq-2.0.2.ebuild 3 Jun 2014 16:54:59 -0000 1.2 |
| 24 |
@@ -1,14 +1,15 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.1 2014/02/03 07:33:22 kumba Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.2 2014/06/03 16:54:59 vapier Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
-inherit eutils multilib |
| 33 |
+inherit eutils multilib autotools |
| 34 |
|
| 35 |
DESCRIPTION="Data Acquisition library, for packet I/O" |
| 36 |
HOMEPAGE="http://www.snort.org/" |
| 37 |
SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz" |
| 38 |
+ |
| 39 |
LICENSE="GPL-2" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 42 |
@@ -22,10 +23,18 @@ |
| 43 |
ipq? ( dev-libs/libdnet |
| 44 |
>=net-firewall/iptables-1.4.10 |
| 45 |
net-libs/libnetfilter_queue )" |
| 46 |
- |
| 47 |
RDEPEND="${DEPEND}" |
| 48 |
|
| 49 |
+src_prepare() { |
| 50 |
+ epatch "${FILESDIR}"/${P}-parallel-grammar.patch #511892 |
| 51 |
+ epatch "${FILESDIR}"/${P}-libpcap-check.patch |
| 52 |
+ eautoreconf |
| 53 |
+} |
| 54 |
+ |
| 55 |
src_configure() { |
| 56 |
+ # We forced libpcap to 1.x, so we can set this cache var so |
| 57 |
+ # cross-compiling doesn't break on us. |
| 58 |
+ daq_cv_libpcap_version_1x=yes \ |
| 59 |
econf \ |
| 60 |
$(use_enable ipv6) \ |
| 61 |
$(use_enable pcap pcap-module) \ |
| 62 |
@@ -44,10 +53,10 @@ |
| 63 |
|
| 64 |
# Remove unneeded .la files |
| 65 |
rm \ |
| 66 |
- "${D}"usr/$(get_libdir)/daq/*.la \ |
| 67 |
- "${D}"usr/$(get_libdir)/libdaq*.la \ |
| 68 |
- "${D}"usr/$(get_libdir)/libsfbpf.la \ |
| 69 |
- || die |
| 70 |
+ "${ED}"usr/$(get_libdir)/daq/*.la \ |
| 71 |
+ "${ED}"usr/$(get_libdir)/libdaq*.la \ |
| 72 |
+ "${ED}"usr/$(get_libdir)/libsfbpf.la \ |
| 73 |
+ || die |
| 74 |
|
| 75 |
# If not using static-libs don't install the static libraries |
| 76 |
# This has been bugged upstream |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.26 net-libs/daq/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/ChangeLog?rev=1.26&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/ChangeLog?rev=1.26&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/daq/ChangeLog?r1=1.25&r2=1.26 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v |
| 89 |
retrieving revision 1.25 |
| 90 |
retrieving revision 1.26 |
| 91 |
diff -u -r1.25 -r1.26 |
| 92 |
--- ChangeLog 3 Feb 2014 07:33:22 -0000 1.25 |
| 93 |
+++ ChangeLog 3 Jun 2014 16:54:59 -0000 1.26 |
| 94 |
@@ -1,6 +1,12 @@ |
| 95 |
# ChangeLog for net-libs/daq |
| 96 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.25 2014/02/03 07:33:22 kumba Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.26 2014/06/03 16:54:59 vapier Exp $ |
| 99 |
+ |
| 100 |
+ 03 Jun 2014; Mike Frysinger <vapier@g.o> |
| 101 |
+ +files/daq-2.0.2-libpcap-check.patch, +files/daq-2.0.2-parallel-grammar.patch, |
| 102 |
+ daq-2.0.2.ebuild: |
| 103 |
+ Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross- |
| 104 |
+ compiling. |
| 105 |
|
| 106 |
*daq-2.0.2 (03 Feb 2014) |
Archives