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 64B5C15800A for ; Tue, 22 Aug 2023 18:04:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 738872BC067; Tue, 22 Aug 2023 18:04:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5B8F02BC067 for ; Tue, 22 Aug 2023 18:04:10 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 550FC3412A9 for ; Tue, 22 Aug 2023 18:04:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6B451060 for ; Tue, 22 Aug 2023 18:04:07 +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: <1692727416.7a2c1f90a07b2adc0b556d6db320a64b74a30ad6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/musl-1.2.4.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7a2c1f90a07b2adc0b556d6db320a64b74a30ad6 X-VCS-Branch: master Date: Tue, 22 Aug 2023 18:04:07 +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: c48a6e0c-0606-4ab2-8571-b6aea3a68c49 X-Archives-Hash: d1bf793acb6a6491db58ce85f5e1b4aa commit: 7a2c1f90a07b2adc0b556d6db320a64b74a30ad6 Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Aug 1 22:29:25 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Aug 22 18:03:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2c1f90 sys-libs/musl: Support LLVM/Clang crossdev This replaces inline code with functions from crossdev.eclass. Now also supports LLVM/Clang crossdev because the eclass handles that automatically. Thanks wikky for help! Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> sys-libs/musl/musl-1.2.4.ebuild | 34 +++++++++++----------------------- sys-libs/musl/musl-9999.ebuild | 40 ++++++++++++++-------------------------- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild index a0653436a844..20b3c7f93d59 100644 --- a/sys-libs/musl/musl-1.2.4.ebuild +++ b/sys-libs/musl/musl-1.2.4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs prefix +inherit crossdev flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -25,14 +25,6 @@ SRC_URI+=" https://dev.gentoo.org/~blueness/musl-misc/iconv.c " -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" HOMEPAGE="https://musl.libc.org" @@ -49,19 +41,15 @@ QA_PRESTRIPPED="usr/lib/crtn.o" # 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 [[ ${CATEGORY} == cross-* ]] ; then +if is_crosspkg ; then IUSE="${IUSE/crypt/+crypt}" else RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" fi -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - just_headers() { - use headers-only && is_crosscompile + use headers-only && target_is_not_host } pkg_setup() { @@ -74,7 +62,7 @@ pkg_setup() { # fix for #667126, copied from glibc ebuild # make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then + if target_is_not_host || tc-is-cross-compiler ; then CHOST=${CTARGET} strip-unsupported-flags fi } @@ -86,7 +74,7 @@ src_unpack() { # We only verify the release; not the additional (fixed, safe) files # we download. # (Seem to get IPC error on verifying in cross?) - ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} fi default @@ -108,7 +96,7 @@ src_configure() { just_headers && export CC=true local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} + target_is_not_host && sysroot=/usr/${CTARGET} ./configure \ --target=${CTARGET} \ --prefix="${EPREFIX}${sysroot}/usr" \ @@ -121,7 +109,7 @@ src_compile() { just_headers && return 0 emake - if [[ ${CATEGORY} != cross-* ]] ; then + if ! is_crosspkg ; then emake -C "${T}" getconf getent iconv \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ @@ -142,7 +130,7 @@ src_install() { # musl provides ldd via a sym link to its ld.so local sysroot= - is_crosscompile && sysroot=/usr/${CTARGET} + target_is_not_host && sysroot=/usr/${CTARGET} local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" @@ -152,7 +140,7 @@ src_install() { rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi - if [[ ${CATEGORY} != cross-* ]] ; then + if ! is_crosspkg ; then # Fish out of config: # ARCH = ... # SUBARCH = ... @@ -187,7 +175,7 @@ src_install() { doenvd "${T}"/00musl fi - if is_crosscompile ; then + if target_is_not_host ; then into /usr/${CTARGET} dolib.a libssp_nonshared.a else @@ -204,7 +192,7 @@ pkg_preinst() { } pkg_postinst() { - is_crosscompile && return 0 + target_is_not_host && return 0 [ -n "${ROOT}" ] && return 0 diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index a72d5929d386..20b3c7f93d59 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit eapi8-dosym flag-o-matic toolchain-funcs prefix +inherit crossdev flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -13,7 +13,7 @@ else 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 ~mips ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )" fi @@ -25,14 +25,6 @@ SRC_URI+=" https://dev.gentoo.org/~blueness/musl-misc/iconv.c " -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" HOMEPAGE="https://musl.libc.org" @@ -49,19 +41,15 @@ QA_PRESTRIPPED="usr/lib/crtn.o" # 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 [[ ${CATEGORY} == cross-* ]] ; then +if is_crosspkg ; then IUSE="${IUSE/crypt/+crypt}" else RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" fi -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - just_headers() { - use headers-only && is_crosscompile + use headers-only && target_is_not_host } pkg_setup() { @@ -74,7 +62,7 @@ pkg_setup() { # fix for #667126, copied from glibc ebuild # make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then + if target_is_not_host || tc-is-cross-compiler ; then CHOST=${CTARGET} strip-unsupported-flags fi } @@ -86,7 +74,7 @@ src_unpack() { # We only verify the release; not the additional (fixed, safe) files # we download. # (Seem to get IPC error on verifying in cross?) - ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + ! target_is_not_host && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} fi default @@ -108,7 +96,7 @@ src_configure() { just_headers && export CC=true local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} + target_is_not_host && sysroot=/usr/${CTARGET} ./configure \ --target=${CTARGET} \ --prefix="${EPREFIX}${sysroot}/usr" \ @@ -121,7 +109,7 @@ src_compile() { just_headers && return 0 emake - if [[ ${CATEGORY} != cross-* ]] ; then + if ! is_crosspkg ; then emake -C "${T}" getconf getent iconv \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ @@ -142,9 +130,9 @@ src_install() { # musl provides ldd via a sym link to its ld.so local sysroot= - is_crosscompile && sysroot=/usr/${CTARGET} + target_is_not_host && sysroot=/usr/${CTARGET} local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) - dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" + dosym -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead @@ -152,7 +140,7 @@ src_install() { rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi - if [[ ${CATEGORY} != cross-* ]] ; then + if ! is_crosspkg ; then # Fish out of config: # ARCH = ... # SUBARCH = ... @@ -187,7 +175,7 @@ src_install() { doenvd "${T}"/00musl fi - if is_crosscompile ; then + if target_is_not_host ; then into /usr/${CTARGET} dolib.a libssp_nonshared.a else @@ -204,7 +192,7 @@ pkg_preinst() { } pkg_postinst() { - is_crosscompile && return 0 + target_is_not_host && return 0 [ -n "${ROOT}" ] && return 0