diff options
| author |   Sam James <sam@gentoo.org> | 2021-11-24 02:59:17 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-11-24 02:59:50 +0000 |
| commit | 3c00b1f3cd54cf0c5cd5e2c7d03d7a099892e12b (patch) | |
| tree | f2f198445eaf1ac0c6f3e3a1e82f62b3d8c23663 /net-analyzer | |
| parent | net-analyzer/wireshark: restore non-obsolete others headers (diff) | |
| download | gentoo-3c00b1f3cd54cf0c5cd5e2c7d03d7a099892e12b.tar.gz gentoo-3c00b1f3cd54cf0c5cd5e2c7d03d7a099892e12b.tar.bz2 gentoo-3c00b1f3cd54cf0c5cd5e2c7d03d7a099892e12b.zip | |
net-analyzer/wireshark: drop 3.6.0 keywords for now (breaks libvirt?)
libvirt fails to build for me right now with `wmem_alloc` undefined errors.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild | 11 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-9999.ebuild | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild index a850f1953b70..87ec81e02281 100644 --- a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild @@ -18,7 +18,8 @@ else SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" S="${WORKDIR}/${P/_/}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" + # Seems to break libvirt? + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" fi LICENSE="GPL-2" @@ -213,6 +214,12 @@ src_install() { # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h + # If trying to remove this, try build e.g. libvirt first! # At last check, Fedora is still doing this too. local dir dirs=( @@ -221,9 +228,9 @@ src_install() { epan/dfilter epan/dissectors epan/ftypes - epan/wmem wiretap wsutil + wsutil/wmem ) for dir in "${dirs[@]}" ; do diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index a850f1953b70..87ec81e02281 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -18,7 +18,8 @@ else SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" S="${WORKDIR}/${P/_/}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" + # Seems to break libvirt? + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86" fi LICENSE="GPL-2" @@ -213,6 +214,12 @@ src_install() { # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins ws_diag_control.h ws_symbol_export.h \ + "${BUILD_DIR}"/config.h + # If trying to remove this, try build e.g. libvirt first! # At last check, Fedora is still doing this too. local dir dirs=( @@ -221,9 +228,9 @@ src_install() { epan/dfilter epan/dissectors epan/ftypes - epan/wmem wiretap wsutil + wsutil/wmem ) for dir in "${dirs[@]}" ; do |