commit: 6167c89db9b5c6f986d8fe7f54e72953d0e9026c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Nov 9 00:56:25 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Nov 9 00:56:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6167c89d
sys-libs/musl: fix header compat w/ elfutils-0.190 Per #musl, this is similar to what will be pushed in musl git soon. Closes: https://bugs.gentoo.org/916857 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/musl-1.2.4-elfutils-0.190-relr.patch | 73 ++++++++ sys-libs/musl/musl-1.2.4-r1.ebuild | 204 +++++++++++++++++++++ 2 files changed, 277 insertions(+) diff --git a/sys-libs/musl/files/musl-1.2.4-elfutils-0.190-relr.patch b/sys-libs/musl/files/musl-1.2.4-elfutils-0.190-relr.patch new file mode 100644 index 000000000000..e5eaf46f7810 --- /dev/null +++ b/sys-libs/musl/files/musl-1.2.4-elfutils-0.190-relr.patch @@ -0,0 +1,73 @@ +https://www.openwall.com/lists/musl/2023/11/06/3 +https://inbox.vuxu.org/musl/20231106113336.3664-2-nc...@alpinelinux.org/T/#u +https://sourceware.org/bugzilla/show_bug.cgi?id=31034 +https://bugs.gentoo.org/916857 + +From mboxrd@z Thu Jan 1 00:00:00 1970 +X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org +X-Spam-Level: +X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, + MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, + RCVD_IN_MSPIKE_WL,T_SCC_BODY_TEXT_LINE autolearn=ham + autolearn_force=no version=3.4.4 +Received: (qmail 5179 invoked from network); 6 Nov 2023 11:46:34 -0000 +Received: from second.openwall.net (193.110.157.125) + by inbox.vuxu.org with ESMTPUTF8; 6 Nov 2023 11:46:34 -0000 +Received: (qmail 30570 invoked by uid 550); 6 Nov 2023 11:46:29 -0000 +Mailing-List: contact musl-h...@lists.openwall.com; run by ezmlm +Precedence: bulk +List-Post: <mailto:m...@lists.openwall.com> +List-Help: <mailto:musl-h...@lists.openwall.com> +List-Unsubscribe: <mailto:musl-unsubscr...@lists.openwall.com> +List-Subscribe: <mailto:musl-subscr...@lists.openwall.com> +List-ID: <musl.lists.openwall.com> +Reply-To: m...@lists.openwall.com +Received: (qmail 30538 invoked from network); 6 Nov 2023 11:46:29 -0000 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alpinelinux.org; + s=smtp; t=1699271177; + h=from:from:reply-to:subject:subject:date:date:message-id:message-id: + to:to:cc:cc:mime-version:mime-version: + content-transfer-encoding:content-transfer-encoding; + bh=73HDLjg72r1JGckDGbEyPxYrYL7dC7MB3gMwy/yp7hc=; + b=pSGCs/DrFDbs9eEA89un578pZbyzpmTw81QGH7xK4ZAAkYiXx1ysaXlsllwxGd076F+plw + kE1QbGVndutc+ieeUOiHomF4O8IP4AqO/8xCy52LlYmnhMTcxgoXD/GWHfVcXmIgFb+8Uc + jvgM9nXFOXceFSlHLLOwJBQFE2dyBrU= +From: Natanael Copa <nc...@alpinelinux.org> +To: m...@lists.openwall.com +Cc: Natanael Copa <nc...@alpinelinux.org> +Date: Mon, 6 Nov 2023 12:33:37 +0100 +Message-ID: <20231106113336.3664-2-nc...@alpinelinux.org> +X-Mailer: git-send-email 2.42.1 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [musl] [PATCH] elf.h: add typedefs for Elf*_Relr + +Add typedefs for Elf32_Relr and Elf64_Relr as a follow-up to commit +d32dadd60efb (ldso: support DT_RELR relative relocation format) + +--- +This fixes build of iproute2 with elfutils 0.190, which assumes that +Elf*_Relr are typedef'ed when SHT_RELR is defined. + +ref: https://sourceware.org/git/?p=elfutils.git;a=commit;h=39f2c500542f69c2f1a13fd0ae4eaa5778d2ed8d +ref: https://sourceware.org/bugzilla/show_bug.cgi?id=31034 + + include/elf.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/elf.h b/include/elf.h +index 23f2c4bc..aa186d9d 100644 +--- a/include/elf.h ++++ b/include/elf.h +@@ -32,6 +32,9 @@ typedef uint16_t Elf64_Section; + typedef Elf32_Half Elf32_Versym; + typedef Elf64_Half Elf64_Versym; + ++typedef Elf32_Word Elf32_Relr; ++typedef Elf64_Xword Elf64_Relr; ++ + #define EI_NIDENT (16) + + typedef struct { +-- +2.42.1 diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild new file mode 100644 index 000000000000..899ae673cc90 --- /dev/null +++ b/sys-libs/musl/musl-1.2.4-r1.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit crossdev flag-o-matic toolchain-funcs prefix +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.musl-libc.org/musl" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/musl.asc + inherit verify-sig + + SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"; + SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )" +fi +GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab" +GETENT_FILE="musl-getent-${GETENT_COMMIT}.c" +SRC_URI+=" + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} + https://dev.gentoo.org/~blueness/musl-misc/iconv.c +" + +DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" +HOMEPAGE="https://musl.libc.org"; + +LICENSE="MIT LGPL-2 GPL-2" +SLOT="0" +IUSE="crypt headers-only split-usr" + +QA_SONAME="usr/lib/libc.so" +QA_DT_NEEDED="usr/lib/libc.so" +# bug #830213 +QA_PRESTRIPPED="usr/lib/crtn.o" + +# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) +# built as part as crossdev. Also, elide the blockers when in cross-*, +# as it doesn't make sense to block the normal CBUILD libxcrypt at all +# there when we're installing into /usr/${CHOST} anyway. +if is_crosspkg ; then + IUSE="${IUSE/crypt/+crypt}" +else + RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" + PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" +fi + +PATCHES=( + "${FILESDIR}"/${P}-elfutils-0.190-relr.patch +) + +just_headers() { + use headers-only && target_is_not_host +} + +pkg_setup() { + if [ ${CTARGET} == ${CHOST} ] ; then + case ${CHOST} in + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if target_is_not_host || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # We only verify the release; not the additional (fixed, safe) files + # we download. + # (Seem to get IPC error on verifying in cross?) + ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + default + + mkdir "${WORKDIR}"/misc || die + cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die + cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die + cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die +} + +src_configure() { + strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343 + tc-getCC ${CTARGET} + + just_headers && export CC=true + + local sysroot + target_is_not_host && sysroot=/usr/${CTARGET} + ./configure \ + --target=${CTARGET} \ + --prefix="${EPREFIX}${sysroot}/usr" \ + --syslibdir="${EPREFIX}${sysroot}/lib" \ + --disable-gcc-wrapper || die +} + +src_compile() { + emake obj/include/bits/alltypes.h + just_headers && return 0 + + emake + if ! is_crosspkg ; then + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${WORKDIR}/misc" + fi + + $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die + $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} + just_headers && return 0 + + # musl provides ldd via a sym link to its ld.so + local sysroot= + target_is_not_host && sysroot=/usr/${CTARGET} + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" + + if ! use crypt ; then + # Allow sys-libs/libxcrypt[system] to provide it instead + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die + fi + + if ! is_crosspkg ; then + # Fish out of config: + # ARCH = ... + # SUBARCH = ... + # and print $(ARCH)$(SUBARCH). + local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) + + # The musl build system seems to create a symlink: + # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) + # During cross or within prefix, there's no guarantee that the host is + # using musl so that file may not exist. Use a relative symlink within + # ${D} instead. + rm "${ED}"/lib/ld-musl-${arch}.so.1 || die + if use split-usr; then + dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1 + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + else + dosym libc.so /usr/lib/ld-musl-${arch}.so.1 + [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die + fi + + cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die + eprefixify "${T}"/ldconfig + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${T}"/getconf + dobin "${T}"/getent + dobin "${T}"/iconv + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die + doenvd "${T}"/00musl + fi + + if target_is_not_host ; then + into /usr/${CTARGET} + dolib.a libssp_nonshared.a + else + dolib.a libssp_nonshared.a + fi +} + +pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d +} + +pkg_postinst() { + target_is_not_host && return 0 + + [ -n "${ROOT}" ] && return 0 + + ldconfig || die +}
