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 D22B115800A for ; Fri, 11 Aug 2023 03:49:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99CA52BC060; Fri, 11 Aug 2023 03:48:29 +0000 (UTC) Received: from out-124.mta0.migadu.com (out-124.mta0.migadu.com [IPv6:2001:41d0:1004:224b::7c]) (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 57A002BC05C for ; Fri, 11 Aug 2023 03:48:28 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=catcream.org; s=key1; t=1691725707; 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: in-reply-to:in-reply-to:references:references; bh=yHpQEElq9U7ZQZG+qnZ76MY28E3FAt75J5wayxCe/Yo=; b=kI/ojtwznT5xqjBCbhGWeoUxTDcmnDSU+Rz9wzaJdpbMOIf1h83pIj4EISJUGWEU/LI3p/ EmNYOwLs/UAFzs8VbLYVrk7YiaIKKS504vkqqYlPXMavRd19s31EWVGWkHsijYAP1LvpD6 LFSXCKoRBiObpFARlRxbQoGhLSvXBI4GWsN0V6b3lwFU9qKw7A+yAq2B4Gx0AfRa1ol/sK joPee5vORn4TRr4n+ZES+Kw8Iq2m5601/+JtmSxrkt9nCEkRmZ79w2fbyRyH9L+QSuW+Ng kPVVhhgyXfZ9GDI74Smrjh3nBma6VeJPj5cxgGnFiYLanP8UFbd8D43a92rFBw== From: Alfred Persson Forsberg To: gentoo-dev@lists.gentoo.org Cc: sam@gentoo.org, llvm@gentoo.org, toolchain@gentoo.org, cross@gentoo.org, Alfred Persson Forsberg Subject: [gentoo-dev] [PATCH 2/4] sys-libs/musl: Support LLVM/Clang crossdev Date: Fri, 11 Aug 2023 05:48:21 +0200 Message-ID: <20230811034823.34301-4-cat@catcream.org> In-Reply-To: <20230811034823.34301-1-cat@catcream.org> References: <20230811034823.34301-1-cat@catcream.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Archives-Salt: 17bb9b7c-5991-4f0a-88d6-542799c5343a X-Archives-Hash: fb7588d2d654bfd9333b002fbba38d43 Signed-off-by: Alfred Persson Forsberg --- sys-libs/musl/musl-1.2.4.ebuild | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sys-libs/musl/musl-1.2.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild index a0653436a844..da55b8c05fe1 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 cross 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,17 +41,13 @@ 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 } @@ -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}" \ @@ -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 = ... -- 2.41.0