| 1 |
commit: 39b68aa3e8f76e368e3f322c75a8f923d2fb3e7d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 30 07:57:49 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 30 07:57:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b68aa3 |
| 7 |
|
| 8 |
net-libs/libpcap: force LEX=flex |
| 9 |
|
| 10 |
Already BDEPENDing on it... |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/884275 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
net-libs/libpcap/libpcap-1.10.1-r2.ebuild | 8 +++++--- |
| 16 |
net-libs/libpcap/libpcap-9999.ebuild | 17 +++++++++++++---- |
| 17 |
2 files changed, 18 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-libs/libpcap/libpcap-1.10.1-r2.ebuild b/net-libs/libpcap/libpcap-1.10.1-r2.ebuild |
| 20 |
index 6edb007ae109..bda001c29111 100644 |
| 21 |
--- a/net-libs/libpcap/libpcap-1.10.1-r2.ebuild |
| 22 |
+++ b/net-libs/libpcap/libpcap-1.10.1-r2.ebuild |
| 23 |
@@ -38,8 +38,8 @@ RDEPEND=" |
| 24 |
" |
| 25 |
DEPEND="${RDEPEND}" |
| 26 |
BDEPEND=" |
| 27 |
- sys-devel/flex |
| 28 |
app-alternatives/yacc |
| 29 |
+ sys-devel/flex |
| 30 |
dbus? ( virtual/pkgconfig ) |
| 31 |
" |
| 32 |
|
| 33 |
@@ -70,8 +70,10 @@ src_prepare() { |
| 34 |
} |
| 35 |
|
| 36 |
multilib_src_configure() { |
| 37 |
- ECONF_SOURCE="${S}" \ |
| 38 |
- econf \ |
| 39 |
+ # bug #884275 |
| 40 |
+ export LEX=flex |
| 41 |
+ |
| 42 |
+ ECONF_SOURCE="${S}" econf \ |
| 43 |
$(use_enable bluetooth) \ |
| 44 |
$(use_enable dbus) \ |
| 45 |
$(use_enable rdma) \ |
| 46 |
|
| 47 |
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild |
| 48 |
index ddd15be165fc..6f83d33095c3 100644 |
| 49 |
--- a/net-libs/libpcap/libpcap-9999.ebuild |
| 50 |
+++ b/net-libs/libpcap/libpcap-9999.ebuild |
| 51 |
@@ -25,7 +25,8 @@ fi |
| 52 |
|
| 53 |
LICENSE="BSD" |
| 54 |
SLOT="0" |
| 55 |
-IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug" |
| 56 |
+IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug" |
| 57 |
+RESTRICT="!test? ( test )" |
| 58 |
|
| 59 |
RDEPEND=" |
| 60 |
bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) |
| 61 |
@@ -37,8 +38,8 @@ RDEPEND=" |
| 62 |
" |
| 63 |
DEPEND="${RDEPEND}" |
| 64 |
BDEPEND=" |
| 65 |
- sys-devel/flex |
| 66 |
app-alternatives/yacc |
| 67 |
+ sys-devel/flex |
| 68 |
dbus? ( virtual/pkgconfig ) |
| 69 |
" |
| 70 |
|
| 71 |
@@ -48,6 +49,7 @@ fi |
| 72 |
|
| 73 |
PATCHES=( |
| 74 |
"${FILESDIR}"/${PN}-1.10.0-usbmon.patch |
| 75 |
+ |
| 76 |
"${FILESDIR}"/${PN}-1.10.1-pcap-config.patch |
| 77 |
) |
| 78 |
|
| 79 |
@@ -62,8 +64,10 @@ src_prepare() { |
| 80 |
} |
| 81 |
|
| 82 |
multilib_src_configure() { |
| 83 |
- ECONF_SOURCE="${S}" \ |
| 84 |
- econf \ |
| 85 |
+ # bug #884275 |
| 86 |
+ export LEX=flex |
| 87 |
+ |
| 88 |
+ ECONF_SOURCE="${S}" econf \ |
| 89 |
$(use_enable bluetooth) \ |
| 90 |
$(use_enable dbus) \ |
| 91 |
$(use_enable rdma) \ |
| 92 |
@@ -76,6 +80,11 @@ multilib_src_configure() { |
| 93 |
|
| 94 |
multilib_src_compile() { |
| 95 |
emake all shared |
| 96 |
+ use test && emake testprogs |
| 97 |
+} |
| 98 |
+ |
| 99 |
+multilib_src_test() { |
| 100 |
+ testprogs/findalldevstest || die |
| 101 |
} |
| 102 |
|
| 103 |
multilib_src_install_all() { |
Archives