| 1 |
commit: b20b5bab12d0085e0c1e92c34ab1a1c39c2b01ce |
| 2 |
Author: Stijn Tintel <stijn <AT> linux-ipv6 <DOT> be> |
| 3 |
AuthorDate: Thu Feb 2 00:17:21 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 2 04:49:56 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20b5bab |
| 7 |
|
| 8 |
net-misc/openvswitch: add USE=unwind |
| 9 |
|
| 10 |
Building net-misc/openvswitch on a host with sys-libs/libunwind |
| 11 |
installed results in several binaries being linked to libunwind.so. |
| 12 |
|
| 13 |
As net-misc/openvswitch lacks a dependency on sys-libs/libunwind, |
| 14 |
installing a binpkg created on such host will result in broken binaries. |
| 15 |
|
| 16 |
There is no configure option to disable libunwind, and upstream enables |
| 17 |
the dependency unconditionally in their RPM spec, but as we support |
| 18 |
architectures that do not support libunwind, this is not an option. |
| 19 |
|
| 20 |
Add a USE flag to toggle libunwind via the autoconf macro. |
| 21 |
|
| 22 |
Closes: https://bugs.gentoo.org/892389 |
| 23 |
Signed-off-by: Stijn Tintel <stijn <AT> linux-ipv6.be> |
| 24 |
Closes: https://github.com/gentoo/gentoo/pull/29385 |
| 25 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 26 |
|
| 27 |
.../{openvswitch-2.17.2-r1.ebuild => openvswitch-2.17.2-r2.ebuild} | 5 ++++- |
| 28 |
profiles/arch/alpha/package.use.mask | 5 +++++ |
| 29 |
profiles/arch/m68k/package.use.mask | 5 +++++ |
| 30 |
profiles/arch/sparc/package.use.mask | 5 +++++ |
| 31 |
4 files changed, 19 insertions(+), 1 deletion(-) |
| 32 |
|
| 33 |
diff --git a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild b/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild |
| 34 |
similarity index 97% |
| 35 |
rename from net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild |
| 36 |
rename to net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild |
| 37 |
index c26ee73a3019..c17e37e3f3bb 100644 |
| 38 |
--- a/net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild |
| 39 |
+++ b/net-misc/openvswitch/openvswitch-2.17.2-r2.ebuild |
| 40 |
@@ -15,7 +15,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" |
| 41 |
LICENSE="Apache-2.0 GPL-2" |
| 42 |
SLOT="0" |
| 43 |
KEYWORDS="amd64 ~arm64 ~ppc64 x86" |
| 44 |
-IUSE="debug modules monitor +ssl" |
| 45 |
+IUSE="debug modules monitor +ssl unwind" |
| 46 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 47 |
|
| 48 |
# Check python/ovs/version.py in tarball for dev-python/ovs dep |
| 49 |
@@ -26,6 +26,7 @@ RDEPEND="${PYTHON_DEPS} |
| 50 |
dev-python/zope-interface[${PYTHON_USEDEP}] |
| 51 |
') |
| 52 |
debug? ( dev-lang/perl ) |
| 53 |
+ unwind? ( sys-libs/libunwind:= ) |
| 54 |
ssl? ( dev-libs/openssl:= )" |
| 55 |
DEPEND="${RDEPEND} |
| 56 |
sys-apps/util-linux[caps]" |
| 57 |
@@ -82,6 +83,8 @@ src_configure() { |
| 58 |
local linux_config |
| 59 |
use modules && linux_config="--with-linux=${KV_OUT_DIR}" |
| 60 |
|
| 61 |
+ export ac_cv_lib_unwind_unw_backtrace="$(usex unwind)" |
| 62 |
+ |
| 63 |
# Need PYTHON3 variable for bug #860240 |
| 64 |
PYTHON3="${PYTHON}" CONFIG_SHELL="${BROOT}"/bin/bash SHELL="${BROOT}"/bin/bash econf ${linux_config} \ |
| 65 |
--with-rundir=/var/run/openvswitch \ |
| 66 |
|
| 67 |
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask |
| 68 |
index d911bcaf7be1..e446e594c592 100644 |
| 69 |
--- a/profiles/arch/alpha/package.use.mask |
| 70 |
+++ b/profiles/arch/alpha/package.use.mask |
| 71 |
@@ -1,6 +1,11 @@ |
| 72 |
# Copyright 1999-2022 Gentoo Authors |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
+# Stijn Tintel <stijn@××××××××××.be> (2023-02-02) |
| 76 |
+# Dependency not keyworded |
| 77 |
+# https://bugs.gentoo.org/show_bug.cgi?id=892389 |
| 78 |
+net-misc/openvswitch unwind |
| 79 |
+ |
| 80 |
# matoro <matoro_gentoo@××××××.tk> (2022-09-22) |
| 81 |
# Unable to test due to mask, bug #763963 |
| 82 |
net-misc/openntpd constraints |
| 83 |
|
| 84 |
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask |
| 85 |
index 98c973ac29d0..0fac36b10ed5 100644 |
| 86 |
--- a/profiles/arch/m68k/package.use.mask |
| 87 |
+++ b/profiles/arch/m68k/package.use.mask |
| 88 |
@@ -1,6 +1,11 @@ |
| 89 |
# Copyright 1999-2022 Gentoo Authors |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
+# Stijn Tintel <stijn@××××××××××.be> (2023-02-02) |
| 93 |
+# Dependency not keyworded |
| 94 |
+# https://bugs.gentoo.org/show_bug.cgi?id=892389 |
| 95 |
+net-misc/openvswitch unwind |
| 96 |
+ |
| 97 |
# Andreas K. Hüttel <dilfridge@g.o> (2022-05-29) |
| 98 |
# No TMP here, no xkb here |
| 99 |
sys-apps/systemd tpm xkb |
| 100 |
|
| 101 |
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask |
| 102 |
index c460aac2ca72..525793fbb21d 100644 |
| 103 |
--- a/profiles/arch/sparc/package.use.mask |
| 104 |
+++ b/profiles/arch/sparc/package.use.mask |
| 105 |
@@ -1,6 +1,11 @@ |
| 106 |
# Copyright 1999-2023 Gentoo Authors |
| 107 |
# Distributed under the terms of the GNU General Public License v2 |
| 108 |
|
| 109 |
+# Stijn Tintel <stijn@××××××××××.be> (2023-02-02) |
| 110 |
+# Dependency not keyworded |
| 111 |
+# https://bugs.gentoo.org/show_bug.cgi?id=892389 |
| 112 |
+net-misc/openvswitch unwind |
| 113 |
+ |
| 114 |
# Sam James <sam@g.o> (2023-01-31) |
| 115 |
# jit not supported on sparc32 or sparc64 |
| 116 |
dev-libs/libpcre2 jit |
Archives