commit: 6a7660e8cfed53d82e252d4a395531888dbba077 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Aug 26 10:38:13 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Aug 26 10:38:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7660e8
sys-libs/libunwind: (partly) fix x32 I get another build failure but let's fix one that has an upstream patch at least. Bug: https://bugs.gentoo.org/961995 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/libunwind/files/libunwind-1.8.2-x32.patch | 26 ++++ sys-libs/libunwind/libunwind-1.8.2-r1.ebuild | 138 +++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/sys-libs/libunwind/files/libunwind-1.8.2-x32.patch b/sys-libs/libunwind/files/libunwind-1.8.2-x32.patch new file mode 100644 index 000000000000..c9c08ce5a7fe --- /dev/null +++ b/sys-libs/libunwind/files/libunwind-1.8.2-x32.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/961995 +https://github.com/libunwind/libunwind/commit/244a713c37b5fd5963334888b63def0c401aa391 + +From 244a713c37b5fd5963334888b63def0c401aa391 Mon Sep 17 00:00:00 2001 +From: aokblast <[email protected]> +Date: Tue, 30 Jul 2024 12:17:20 +0800 +Subject: [PATCH] add Fix of ELFW in find_build_id_path + +--- a/src/elfxx.c ++++ b/src/elfxx.c +@@ -819,10 +819,10 @@ elf_w (find_build_id_path) (const struct elf_image *ei, char *path, unsigned pat + const char prefix[] = "/usr/lib/debug/.build-id/"; + + /* See "man 5 elf" for notes about alignment in Nhdr */ +- const Elf_W(Nhdr) *nhdr = (const ElfW(Nhdr) *) notes; +- const ElfW(Word) namesz = nhdr->n_namesz; +- const ElfW(Word) descsz = nhdr->n_descsz; +- const ElfW(Word) nameasz = UNW_ALIGN(namesz, 4); /* Aligned size */ ++ const Elf_W(Nhdr) *nhdr = (const Elf_W(Nhdr) *) notes; ++ const Elf_W(Word) namesz = nhdr->n_namesz; ++ const Elf_W(Word) descsz = nhdr->n_descsz; ++ const Elf_W(Word) nameasz = UNW_ALIGN(namesz, 4); /* Aligned size */ + const char *name = (const char *) (nhdr + 1); + const uint8_t *desc = (const uint8_t *) name + nameasz; + unsigned j; + diff --git a/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild b/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild new file mode 100644 index 000000000000..139a892af8cb --- /dev/null +++ b/sys-libs/libunwind/libunwind-1.8.2-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 2005-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-libunwind-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${LIBUNWIND_DOCS_PREBUILT:=1} + +LIBUNWIND_DOCS_PREBUILT_DEV=sam +LIBUNWIND_DOCS_VERSION=1.8.0 +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +LIBUNWIND_DOCS_USEFLAG="+doc" + +inherit libtool multilib-minimal + +DESCRIPTION="Portable and efficient API to determine the call-chain of a program" +HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"; + +if [[ ${PV} == 9999 ]] ; then + LIBUNWIND_DOCS_PREBUILT=0 + + EGIT_REPO_URI="https://github.com/libunwind/libunwind"; + inherit autotools git-r3 +else + SRC_URI="https://github.com/libunwind/libunwind/releases/download/v${PV/_rc/-rc}/${P/_rc/-rc}.tar.gz"; + if [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${LIBUNWIND_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${LIBUNWIND_DOCS_VERSION}-docs.tar.xz )" + fi + S="${WORKDIR}"/${P/_rc/-rc} + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 -sparc ~x86 ~amd64-linux ~x86-linux" + fi +fi + +[[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] && LIBUNWIND_DOCS_USEFLAG="doc" + +LICENSE="MIT" +SLOT="0/8" # libunwind.so.8 +IUSE="debug debug-frame ${LIBUNWIND_DOCS_USEFLAG} libatomic lzma static-libs test zlib" +# XXX: if enabling tests again, make sure to arrange for deleting them so they don't get installed +# https://github.com/libunwind/libunwind/pull/722 +RESTRICT="test !test? ( test )" # some tests are broken (toolchain version dependent, rely on external binaries) + +BDEPEND=" + doc? ( app-text/texlive-core ) +" +RDEPEND=" + lzma? ( app-arch/xz-utils[static-libs?,${MULTILIB_USEDEP}] ) + zlib? ( sys-libs/zlib[static-libs?,${MULTILIB_USEDEP}] ) +" +# We just use the header from libatomic. +DEPEND=" + ${RDEPEND} + libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] ) +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libunwind.h + + # see libunwind.h for the full list of arch-specific headers + /usr/include/libunwind-aarch64.h + /usr/include/libunwind-arm.h + /usr/include/libunwind-hppa.h + /usr/include/libunwind-ia64.h + /usr/include/libunwind-mips.h + /usr/include/libunwind-ppc32.h + /usr/include/libunwind-ppc64.h + /usr/include/libunwind-riscv.h + /usr/include/libunwind-sh.h + /usr/include/libunwind-tilegx.h + /usr/include/libunwind-x86.h + /usr/include/libunwind-x86_64.h +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-x32.patch +) + +src_prepare() { + default + + chmod +x src/ia64/mk_cursor_i || die + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + elibtoolize + fi +} + +multilib_src_configure() { + local myeconfargs=( + # --enable-cxx-exceptions: always enable it, headers provide the interface + # and on some archs it is disabled by default causing a mismatch between the + # API and the ABI, bug #418253 + --enable-cxx-exceptions + --enable-coredump + --enable-ptrace + --enable-setjmp + $(use_enable debug-frame) + $(multilib_native_use_enable doc documentation) + $(use_enable lzma minidebuginfo) + $(use_enable static-libs static) + $(use_enable zlib zlibdebuginfo) + # conservative-checks: validate memory addresses before use; as of 1.0.1, + # only x86_64 supports this, yet may be useful for debugging, couple it with + # debug useflag. + $(use_enable debug conservative_checks) + $(use_enable debug) + $(use_enable test tests) + ) + + export ac_cv_header_atomic_ops_h=$(usex libatomic) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + # bug #586208 + CCACHE_NODIRECT=1 default +} + +multilib_src_test() { + # Sandbox causes some tests to freak out. + SANDBOX_ON=0 emake check +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -type f -delete || die + + # If USE=doc, there'll be newly generated docs which we install instead. + if ! use doc && [[ ${LIBUNWIND_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${LIBUNWIND_DOCS_VERSION}-docs/man*/*.[0-8] + fi +}
