| 1 |
commit: 3c00b1f3cd54cf0c5cd5e2c7d03d7a099892e12b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 24 02:59:17 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 24 02:59:50 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c00b1f3 |
| 7 |
|
| 8 |
net-analyzer/wireshark: drop 3.6.0 keywords for now (breaks libvirt?) |
| 9 |
|
| 10 |
libvirt fails to build for me right now with `wmem_alloc` undefined errors. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 11 +++++++++-- |
| 15 |
net-analyzer/wireshark/wireshark-9999.ebuild | 11 +++++++++-- |
| 16 |
2 files changed, 18 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild |
| 19 |
index a850f1953b70..87ec81e02281 100644 |
| 20 |
--- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild |
| 21 |
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild |
| 22 |
@@ -18,7 +18,8 @@ else |
| 23 |
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" |
| 24 |
S="${WORKDIR}/${P/_/}" |
| 25 |
|
| 26 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" |
| 27 |
+ # Seems to break libvirt? |
| 28 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" |
| 29 |
fi |
| 30 |
|
| 31 |
LICENSE="GPL-2" |
| 32 |
@@ -213,6 +214,12 @@ src_install() { |
| 33 |
# FAQ is not required as is installed from help/faq.txt |
| 34 |
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
| 35 |
|
| 36 |
+ |
| 37 |
+ # install headers |
| 38 |
+ insinto /usr/include/wireshark |
| 39 |
+ doins ws_diag_control.h ws_symbol_export.h \ |
| 40 |
+ "${BUILD_DIR}"/config.h |
| 41 |
+ |
| 42 |
# If trying to remove this, try build e.g. libvirt first! |
| 43 |
# At last check, Fedora is still doing this too. |
| 44 |
local dir dirs=( |
| 45 |
@@ -221,9 +228,9 @@ src_install() { |
| 46 |
epan/dfilter |
| 47 |
epan/dissectors |
| 48 |
epan/ftypes |
| 49 |
- epan/wmem |
| 50 |
wiretap |
| 51 |
wsutil |
| 52 |
+ wsutil/wmem |
| 53 |
) |
| 54 |
|
| 55 |
for dir in "${dirs[@]}" ; do |
| 56 |
|
| 57 |
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild |
| 58 |
index a850f1953b70..87ec81e02281 100644 |
| 59 |
--- a/net-analyzer/wireshark/wireshark-9999.ebuild |
| 60 |
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild |
| 61 |
@@ -18,7 +18,8 @@ else |
| 62 |
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" |
| 63 |
S="${WORKDIR}/${P/_/}" |
| 64 |
|
| 65 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" |
| 66 |
+ # Seems to break libvirt? |
| 67 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" |
| 68 |
fi |
| 69 |
|
| 70 |
LICENSE="GPL-2" |
| 71 |
@@ -213,6 +214,12 @@ src_install() { |
| 72 |
# FAQ is not required as is installed from help/faq.txt |
| 73 |
dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* |
| 74 |
|
| 75 |
+ |
| 76 |
+ # install headers |
| 77 |
+ insinto /usr/include/wireshark |
| 78 |
+ doins ws_diag_control.h ws_symbol_export.h \ |
| 79 |
+ "${BUILD_DIR}"/config.h |
| 80 |
+ |
| 81 |
# If trying to remove this, try build e.g. libvirt first! |
| 82 |
# At last check, Fedora is still doing this too. |
| 83 |
local dir dirs=( |
| 84 |
@@ -221,9 +228,9 @@ src_install() { |
| 85 |
epan/dfilter |
| 86 |
epan/dissectors |
| 87 |
epan/ftypes |
| 88 |
- epan/wmem |
| 89 |
wiretap |
| 90 |
wsutil |
| 91 |
+ wsutil/wmem |
| 92 |
) |
| 93 |
|
| 94 |
for dir in "${dirs[@]}" ; do |
Archives