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 24F43158012 for ; Sat, 10 Sep 2022 11:28:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 667C5E0903; Sat, 10 Sep 2022 11:28:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 474D6E0903 for ; Sat, 10 Sep 2022 11:28:34 +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 60A93340F22 for ; Sat, 10 Sep 2022 11:28:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CE85B599 for ; Sat, 10 Sep 2022 11:28:31 +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: <1662809282.fbdcef42c8f58fdd5175f2130afd56b8e42ef226.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.3-r1.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: fbdcef42c8f58fdd5175f2130afd56b8e42ef226 X-VCS-Branch: master Date: Sat, 10 Sep 2022 11:28:31 +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: e840546d-6020-46a1-9b05-7f769180c957 X-Archives-Hash: 42eb48651e67a90b183bd7a267f4046d commit: fbdcef42c8f58fdd5175f2130afd56b8e42ef226 Author: Sam James gentoo org> AuthorDate: Thu Sep 8 03:21:04 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 10 11:28:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdcef42 sys-libs/musl: add USE=crypt for libxcrypt support Add USE=crypt to allow enabling/disabling crypt.h installation (to allow sys-libs/libxcrypt[system] usage). Many things are starting to want functions from libxcrypt itself (additional functions and algorithms). musl isn't removing crypt.h (and the relevant functions from its libc), unlike glibc, but we need to allow disabling the installation of crypt.h to allow libxcrypt[system] usage (which provides crypt.h & libcrypt.so instead, with more functionality). This brings musl in line with the changes we made for glibc a while ago. The situation with glibc is a bit different because the migration is mandatory there, while we're just strongly recommending it for musl because sys-libs/libxcrypt[-system] causes headaches (see linked PAM bug for an example, but I've also hit a similar issue with Python yesterday). Bug: https://bugs.gentoo.org/867991 Bug: https://bugs.gentoo.org/699422 Signed-off-by: Sam James gentoo.org> sys-libs/musl/{musl-9999.ebuild => musl-1.2.3-r1.ebuild} | 10 +++++++++- sys-libs/musl/musl-9999.ebuild | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r1.ebuild similarity index 95% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.2.3-r1.ebuild index 07ab1388cef8..fedb9137f4cb 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.2.3-r1.ebuild @@ -35,13 +35,16 @@ fi 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="headers-only" +IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" +RDEPEND="crypt? ( sys-libs/libxcrypt[system] )" + is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } @@ -131,6 +134,11 @@ src_install() { local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) dosym ${EPREFIX}${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 + fi + if [[ ${CATEGORY} != cross-* ]] ; then # Fish out of config: # ARCH = ... diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 07ab1388cef8..fedb9137f4cb 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -35,13 +35,16 @@ fi 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="headers-only" +IUSE="crypt headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" +RDEPEND="crypt? ( sys-libs/libxcrypt[system] )" + is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } @@ -131,6 +134,11 @@ src_install() { local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) dosym ${EPREFIX}${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 + fi + if [[ ${CATEGORY} != cross-* ]] ; then # Fish out of config: # ARCH = ...