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 E1B38158003 for ; Sat, 20 Aug 2022 00:59:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1240E0809; Sat, 20 Aug 2022 00:59:30 +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 C5D2AE0809 for ; Sat, 20 Aug 2022 00:59:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D3FF0340D79 for ; Sat, 20 Aug 2022 00:59:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C4D71E for ; Sat, 20 Aug 2022 00:59:28 +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: <1660957138.77cec48da70c6d6424ed6dba4357dd8eacd262c2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/glibc/glibc-2.33-r13.ebuild sys-libs/glibc/glibc-2.33-r14.ebuild sys-libs/glibc/glibc-2.34-r13.ebuild sys-libs/glibc/glibc-2.34-r14.ebuild sys-libs/glibc/glibc-2.35-r8.ebuild sys-libs/glibc/glibc-2.36.ebuild sys-libs/glibc/glibc-9999.ebuild X-VCS-Directories: sys-libs/glibc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 77cec48da70c6d6424ed6dba4357dd8eacd262c2 X-VCS-Branch: master Date: Sat, 20 Aug 2022 00:59:28 +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: 6777e7e4-8cb6-43f9-93c7-aa88660f5e69 X-Archives-Hash: b546f88c5089f4f7f6c35b11e4b16967 commit: 77cec48da70c6d6424ed6dba4357dd8eacd262c2 Author: Adrian Ratiu collabora com> AuthorDate: Fri Aug 5 12:41:45 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 20 00:58:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cec48d sys-libs/glibc: make crypt.h install depend on crypt use flag The crypt use flag is supposed to control whether libcrypt and its associated crypt.h are installed, but it's ignored in header-only builds and crypt.h is always installed. This generates a conflict for eg with sys-libs/libcxrypt installed as a system lib which provides /usr/include/crypt.h even if glibc is built with -crypt. The solution is for glibc to properly respect the crypt use flag when installing the headers. Fixes: https://bugs.gentoo.org/863812 Signed-off-by: Adrian Ratiu collabora.com> Closes: https://github.com/gentoo/gentoo/pull/26747 Signed-off-by: Sam James gentoo.org> sys-libs/glibc/{glibc-2.33-r13.ebuild => glibc-2.33-r14.ebuild} | 1 + sys-libs/glibc/{glibc-2.34-r13.ebuild => glibc-2.34-r14.ebuild} | 1 + sys-libs/glibc/glibc-2.35-r8.ebuild | 1 + sys-libs/glibc/glibc-2.36.ebuild | 1 + sys-libs/glibc/glibc-9999.ebuild | 1 + 5 files changed, 5 insertions(+) diff --git a/sys-libs/glibc/glibc-2.33-r13.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild similarity index 99% rename from sys-libs/glibc/glibc-2.33-r13.ebuild rename to sys-libs/glibc/glibc-2.33-r14.ebuild index 9fd5d468641c..98877549d384 100644 --- a/sys-libs/glibc/glibc-2.33-r13.ebuild +++ b/sys-libs/glibc/glibc-2.33-r14.ebuild @@ -1131,6 +1131,7 @@ glibc_headers_configure() { --host=${CTARGET_OPT:-${CTARGET}} --with-headers=$(build_eprefix)$(alt_build_headers) --prefix="$(host_eprefix)/usr" + $(use_enable crypt) ${EXTRA_ECONF} ) diff --git a/sys-libs/glibc/glibc-2.34-r13.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild similarity index 99% rename from sys-libs/glibc/glibc-2.34-r13.ebuild rename to sys-libs/glibc/glibc-2.34-r14.ebuild index 1cd002c9c54a..454796952613 100644 --- a/sys-libs/glibc/glibc-2.34-r13.ebuild +++ b/sys-libs/glibc/glibc-2.34-r14.ebuild @@ -1149,6 +1149,7 @@ glibc_headers_configure() { --host=${CTARGET_OPT:-${CTARGET}} --with-headers=$(build_eprefix)$(alt_build_headers) --prefix="$(host_eprefix)/usr" + $(use_enable crypt) ${EXTRA_ECONF} ) diff --git a/sys-libs/glibc/glibc-2.35-r8.ebuild b/sys-libs/glibc/glibc-2.35-r8.ebuild index 25a735d93196..9ae33c6fc9d5 100644 --- a/sys-libs/glibc/glibc-2.35-r8.ebuild +++ b/sys-libs/glibc/glibc-2.35-r8.ebuild @@ -1142,6 +1142,7 @@ glibc_headers_configure() { --host=${CTARGET_OPT:-${CTARGET}} --with-headers=$(build_eprefix)$(alt_build_headers) --prefix="$(host_eprefix)/usr" + $(use_enable crypt) ${EXTRA_ECONF} ) diff --git a/sys-libs/glibc/glibc-2.36.ebuild b/sys-libs/glibc/glibc-2.36.ebuild index dc52203e0fe7..1ef2d277f251 100644 --- a/sys-libs/glibc/glibc-2.36.ebuild +++ b/sys-libs/glibc/glibc-2.36.ebuild @@ -1140,6 +1140,7 @@ glibc_headers_configure() { --host=${CTARGET_OPT:-${CTARGET}} --with-headers=$(build_eprefix)$(alt_build_headers) --prefix="$(host_eprefix)/usr" + $(use_enable crypt) ${EXTRA_ECONF} ) diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 92b54a5a254a..6797fdf6cd8a 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1140,6 +1140,7 @@ glibc_headers_configure() { --host=${CTARGET_OPT:-${CTARGET}} --with-headers=$(build_eprefix)$(alt_build_headers) --prefix="$(host_eprefix)/usr" + $(use_enable crypt) ${EXTRA_ECONF} )