From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82EB4158094 for ; Fri, 30 Sep 2022 02:47:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4529E0E75; Fri, 30 Sep 2022 02:47:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C21AE0E75 for ; Fri, 30 Sep 2022 02:47:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 650C5340E9E for ; Fri, 30 Sep 2022 02:47:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4B8A1E for ; Fri, 30 Sep 2022 02:46:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664505988.e24041ef403ad622cc187eea98e42b0fa291cf11.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/, net-fs/samba/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch net-fs/samba/metadata.xml net-fs/samba/samba-4.15.9-r1.ebuild net-fs/samba/samba-4.15.9.ebuild net-fs/samba/samba-4.16.0-r1.ebuild net-fs/samba/samba-4.16.0-r2.ebuild net-fs/samba/samba-4.16.1-r1.ebuild net-fs/samba/samba-4.16.1.ebuild net-fs/samba/samba-4.16.2-r1.ebuild net-fs/samba/samba-4.16.2.ebuild net-fs/samba/samba-4.16.4-r1.ebuild net-fs/samba/samba-4.16.4.ebuild X-VCS-Directories: net-fs/samba/ net-fs/samba/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e24041ef403ad622cc187eea98e42b0fa291cf11 X-VCS-Branch: master Date: Fri, 30 Sep 2022 02:46:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 43e6ba40-aa74-417b-b6e3-2d1a52e9efc2 X-Archives-Hash: c2b5db7b0afb06ef00559d17477488ed commit: e24041ef403ad622cc187eea98e42b0fa291cf11 Author: Fco Javier Felix inode64 com> AuthorDate: Sat Sep 24 06:30:58 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 30 02:46:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24041ef net-fs/samba: Make libunwind optional (fix automagic dep) It's only for debug and backtraces. Backport from samba-4.17, Look at the bugs in: https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd See: https://github.com/gentoo/gentoo/pull/24280 Closes: https://bugs.gentoo.org/791349 Closes: https://github.com/gentoo/gentoo/pull/27422 Package-Manager: Portage-3.0.36, pkgcheck-0.10.14 Signed-off-by: Fco Javier Felix inode64.com> Signed-off-by: Fco Javier Felix inode64.com> Signed-off-by: Sam James gentoo.org> .../files/samba-4.15.9-libunwind-automagic.patch | 118 +++++++++++++++++++++ net-fs/samba/metadata.xml | 1 + ...{samba-4.15.9.ebuild => samba-4.15.9-r1.ebuild} | 11 +- ...mba-4.16.0-r1.ebuild => samba-4.16.0-r2.ebuild} | 11 +- ...{samba-4.16.1.ebuild => samba-4.16.1-r1.ebuild} | 11 +- ...{samba-4.16.2.ebuild => samba-4.16.2-r1.ebuild} | 11 +- ...{samba-4.16.4.ebuild => samba-4.16.4-r1.ebuild} | 11 +- 7 files changed, 159 insertions(+), 15 deletions(-) diff --git a/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch b/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch new file mode 100644 index 000000000000..c3a2c802e6e9 --- /dev/null +++ b/net-fs/samba/files/samba-4.15.9-libunwind-automagic.patch @@ -0,0 +1,118 @@ +https://gitlab.com/samba-team/samba/-/commit/14feb93d481011765f62614ab49b304e17e4f6fd +https://gitlab.com/samba-team/samba/-/merge_requests/2401?commit_id=ac8064cb0d79db377df75a22a240632dbc37f99f +https://bugs.gentoo.org/791349 + +From 14feb93d481011765f62614ab49b304e17e4f6fd Mon Sep 17 00:00:00 2001 +From: Andrew Bartlett +Date: Tue, 7 Jun 2022 15:07:59 +1200 +Subject: [PATCH] lib/util: Prefer backtrace_symbols() for internal backtraces + +Backtraces when Samba is in PANIC state are better with +backtrace_symbols() than with libunwind on Ubuntu 20.04 x86_64 +so move libunwind to a off-by-default option, prompted for +if backtrace_symbols() is not available. + +Based on a request by Fco Javier Felix + +Signed-off-by: Andrew Bartlett +Reviewed-by: Joseph Sutton +--- a/lib/util/fault.c ++++ b/lib/util/fault.c +@@ -222,9 +222,13 @@ _PUBLIC_ void smb_panic(const char *why) + void log_stack_trace(void) + { + #ifdef HAVE_LIBUNWIND +- /* Try to use libunwind before any other technique since on ia64 +- * libunwind correctly walks the stack in more circumstances than +- * backtrace. ++ /* ++ * --with-libunwind is required to use libunwind, the ++ * backtrace_symbols() code below is the default. ++ * ++ * This code is available because a previous version of this ++ * comment asserted that on ia64 libunwind correctly walks the ++ * stack in more circumstances than backtrace. + */ + unw_cursor_t cursor; + unw_context_t uc; +--- a/lib/util/wscript ++++ b/lib/util/wscript +@@ -2,6 +2,15 @@ def options(opt): + ''' This is a bit strange, but disable is the flag, not enable. ''' + opt.add_option('--disable-fault-handling', action='store_true', dest='disable_fault_handling', help=('disable the fault handlers'), default=False) + ++ # We do not want libunwind by default (backtrace_symbols() in ++ # glibc is better) but allow (eg) IA-64 to build with it where it ++ # might be better (per old comment in fault.c) ++ opt.samba_add_onoff_option('libunwind', ++ default=None, ++ help='''Use libunwind instead of the default backtrace_symbols() ++ from libc, for example on IA-64 where it might give a better ++ backtrace.''') ++ + opt.add_option('--with-systemd', + help=("Enable systemd integration"), + action='store_true', dest='enable_systemd') +--- a/lib/util/wscript_configure ++++ b/lib/util/wscript_configure +@@ -1,23 +1,35 @@ + #!/usr/bin/env python +-from waflib import Logs, Options ++from waflib import Logs, Options, Errors + + import os, sys + + if Options.options.disable_fault_handling: + conf.DEFINE('HAVE_DISABLE_FAULT_HANDLING',1) + +-# backtrace could be in libexecinfo or in libc ++# backtrace could be in libexecinfo or in libc. ++# This is our preferred backtrace handler (more useful output than libunwind as at Ubuntu 20.04 x86_64) + conf.CHECK_FUNCS_IN('backtrace backtrace_symbols', 'execinfo', checklibc=True, headers='execinfo.h') + conf.CHECK_HEADERS('execinfo.h') + + conf.SET_TARGET_TYPE('LIBUNWIND', 'EMPTY') +-if conf.check_cfg(package='libunwind-generic', +- args='--cflags --libs', +- msg='Checking for libunwind', +- uselib_store='LIBUNWIND', +- mandatory=False): +- if conf.CHECK_HEADERS('libunwind.h'): +- conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB') ++if Options.options.with_libunwind: ++ if conf.check_cfg(package='libunwind-generic', ++ args='--cflags --libs', ++ msg='Checking for libunwind', ++ uselib_store='LIBUNWIND', ++ mandatory=False): ++ if conf.CHECK_HEADERS('libunwind.h'): ++ conf.SET_TARGET_TYPE('LIBUNWIND', 'SYSLIB') ++ else: ++ raise Errors.WafError('--with-libunwind specified but libunwind not found') ++elif Options.options.with_libunwind == None: ++ if not conf.CONFIG_SET('HAVE_BACKTRACE_SYMBOLS') \ ++ and not Options.options.disable_fault_handling: ++ raise Errors.WafError( ++'''backtrace_symbols() not found but ++--with-libunwind not specified. ++Use --without-libunwind to build without internal backtrace support or ++--disable-fault-handling to totally defer fault handling to the OS.''') + + conf.CHECK_STRUCTURE_MEMBER('struct statvfs', 'f_frsize', define='HAVE_FRSIZE', headers='sys/statvfs.h') + +--- a/script/autobuild.py ++++ b/script/autobuild.py +@@ -480,10 +480,11 @@ tasks = { + # MIT Kerberos from the current system. Runtime behaviour is + # confirmed via the ktest (static ccache and keytab) environment + ++ # This environment also used to confirm we can still build with --with-libunwind + "samba-ktest-mit": { + "sequence": [ + ("random-sleep", random_sleep(300, 900)), +- ("configure", "./configure.developer --without-ad-dc --with-system-mitkrb5 " + samba_configure_params), ++ ("configure", "./configure.developer --without-ad-dc --with-libunwind --with-system-mitkrb5 " + samba_configure_params), + ("make", "make -j"), + ("test", make_test(include_envs=[ + "ktest", # ktest is also tested in fileserver, samba and +GitLab diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml index 0430625e206a..eedfdee5aad4 100644 --- a/net-fs/samba/metadata.xml +++ b/net-fs/samba/metadata.xml @@ -29,6 +29,7 @@ bundled heimdal. Use app-crypt/mit-krb5 instead of app-crypt/heimdal. + Enable libunwind usage for backtraces Enables support for the winbind auth daemon diff --git a/net-fs/samba/samba-4.15.9.ebuild b/net-fs/samba/samba-4.15.9-r1.ebuild similarity index 96% rename from net-fs/samba/samba-4.15.9.ebuild rename to net-fs/samba/samba-4.15.9-r1.ebuild index 3ea8aa274e59..6042a3515c40 100644 --- a/net-fs/samba/samba-4.15.9.ebuild +++ b/net-fs/samba/samba-4.15.9-r1.ebuild @@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam -glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind +glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux +snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -87,7 +87,6 @@ COMMON_DEPEND=" net-dns/bind-tools[gssapi] ) ") - !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) @@ -108,6 +107,10 @@ COMMON_DEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) zeroconf? ( net-dns/avahi[dbus] ) " DEPEND="${COMMON_DEPEND} @@ -141,6 +144,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" + "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -229,6 +233,7 @@ multilib_src_configure() { $(multilib_native_use_with systemd) --systemd-install-services --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) $(multilib_native_use_with winbind) $(multilib_native_usex python '' '--disable-python') $(multilib_native_use_enable zeroconf avahi) diff --git a/net-fs/samba/samba-4.16.0-r1.ebuild b/net-fs/samba/samba-4.16.0-r2.ebuild similarity index 96% rename from net-fs/samba/samba-4.16.0-r1.ebuild rename to net-fs/samba/samba-4.16.0-r2.ebuild index a7d3fa8bb5d3..5e93ab77f6a8 100644 --- a/net-fs/samba/samba-4.16.0-r1.ebuild +++ b/net-fs/samba/samba-4.16.0-r2.ebuild @@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam -glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind +glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux +snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -87,7 +87,6 @@ COMMON_DEPEND=" net-dns/bind-tools[gssapi] ) ") - !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) @@ -108,6 +107,10 @@ COMMON_DEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) zeroconf? ( net-dns/avahi[dbus] ) " DEPEND="${COMMON_DEPEND} @@ -141,6 +144,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" + "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -229,6 +233,7 @@ multilib_src_configure() { $(multilib_native_use_with systemd) --systemd-install-services --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) $(multilib_native_use_with winbind) $(multilib_native_usex python '' '--disable-python') $(multilib_native_use_enable zeroconf avahi) diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1-r1.ebuild similarity index 96% rename from net-fs/samba/samba-4.16.1.ebuild rename to net-fs/samba/samba-4.16.1-r1.ebuild index 8b16a80d66cb..0c212106d9e4 100644 --- a/net-fs/samba/samba-4.16.1.ebuild +++ b/net-fs/samba/samba-4.16.1-r1.ebuild @@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam -glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind +glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux +snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -87,7 +87,6 @@ COMMON_DEPEND=" net-dns/bind-tools[gssapi] ) ") - !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) @@ -108,6 +107,10 @@ COMMON_DEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) zeroconf? ( net-dns/avahi[dbus] ) " DEPEND="${COMMON_DEPEND} @@ -142,6 +145,7 @@ BDEPEND="${PYTHON_DEPS} PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" + "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -230,6 +234,7 @@ multilib_src_configure() { $(multilib_native_use_with systemd) --systemd-install-services --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) $(multilib_native_use_with winbind) $(multilib_native_usex python '' '--disable-python') $(multilib_native_use_enable zeroconf avahi) diff --git a/net-fs/samba/samba-4.16.2.ebuild b/net-fs/samba/samba-4.16.2-r1.ebuild similarity index 96% rename from net-fs/samba/samba-4.16.2.ebuild rename to net-fs/samba/samba-4.16.2-r1.ebuild index e5115c4e9c41..994f304e789e 100644 --- a/net-fs/samba/samba-4.16.2.ebuild +++ b/net-fs/samba/samba-4.16.2-r1.ebuild @@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam -glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind +glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux +snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -87,7 +87,6 @@ COMMON_DEPEND=" net-dns/bind-tools[gssapi] ) ") - !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) @@ -108,6 +107,10 @@ COMMON_DEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) zeroconf? ( net-dns/avahi[dbus] ) " DEPEND="${COMMON_DEPEND} @@ -143,6 +146,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.16.1-netdb-defines.patch" "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" + "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -232,6 +236,7 @@ multilib_src_configure() { $(multilib_native_use_with systemd) --systemd-install-services --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) $(multilib_native_use_with winbind) $(multilib_native_usex python '' '--disable-python') $(multilib_native_use_enable zeroconf avahi) diff --git a/net-fs/samba/samba-4.16.4.ebuild b/net-fs/samba/samba-4.16.4-r1.ebuild similarity index 96% rename from net-fs/samba/samba-4.16.4.ebuild rename to net-fs/samba/samba-4.16.4-r1.ebuild index ae46c2cab18c..6dc422deafb4 100644 --- a/net-fs/samba/samba-4.16.4.ebuild +++ b/net-fs/samba/samba-4.16.4-r1.ebuild @@ -23,8 +23,8 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam -glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind +glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux +snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -87,7 +87,6 @@ COMMON_DEPEND=" net-dns/bind-tools[gssapi] ) ") - !alpha? ( !sparc? ( sys-libs/libunwind:= ) ) acl? ( virtual/acl ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto ) @@ -108,6 +107,10 @@ COMMON_DEPEND=" system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.19[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd:0= ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) + ) zeroconf? ( net-dns/avahi[dbus] ) " DEPEND="${COMMON_DEPEND} @@ -145,6 +148,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.16.2-fix-musl-without-innetgr.patch" "${FILESDIR}/ldb-2.5.2-skip-wav-tevent-check.patch" "${FILESDIR}/${P}-glibc-2.36.patch" + "${FILESDIR}/${PN}-4.15.9-libunwind-automagic.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" @@ -234,6 +238,7 @@ multilib_src_configure() { $(multilib_native_use_with systemd) --systemd-install-services --with-systemddir="$(systemd_get_systemunitdir)" + $(multilib_native_use_with unwind libunwind) $(multilib_native_use_with winbind) $(multilib_native_usex python '' '--disable-python') $(multilib_native_use_enable zeroconf avahi)