commit: 71a7e7c01404fe221bb9763dd3d4f58f5a701984 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Thu Apr 17 09:59:39 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 17 13:02:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a7e7c0
net-analyzer/wireshark: drop py3.10, allow LTO again in -9999 Bug: https://bugs.gentoo.org/754021 Bug: https://bugs.gentoo.org/941890 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Closes: https://github.com/gentoo/gentoo/pull/41627 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/wireshark-9999.ebuild | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 5c0d7c42f778..7997fc4c1fd9 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -4,9 +4,9 @@ EAPI=8 LUA_COMPAT=( lua5-{3..4} ) -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) -inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils toolchain-funcs xdg cmake DESCRIPTION="Network protocol analyzer (sniffer)" HOMEPAGE="https://www.wireshark.org/"; @@ -156,10 +156,6 @@ src_configure() { append-cxxflags -fPIC -DPIC fi - # crashes at runtime - # https://bugs.gentoo.org/754021 - filter-lto - mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) @@ -209,8 +205,6 @@ src_configure() { -DENABLE_ILBC=$(usex ilbc) -DENABLE_KERBEROS=$(usex kerberos) -DENABLE_LIBXML2=$(usex libxml2) - # only appends -flto - -DENABLE_LTO=OFF -DENABLE_LUA=$(usex lua) -DLUA_FIND_VERSIONS="${ELUA#lua}" -DENABLE_LZ4=$(usex lz4) @@ -233,6 +227,8 @@ src_configure() { -DENABLE_ZSTD=$(usex zstd) ) + tc-is-lto && mycmakeargs+=( -DENABLE_LTO=ON ) + cmake_src_configure }
