commit: 77cec48da70c6d6424ed6dba4357dd8eacd262c2 Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> AuthorDate: Fri Aug 5 12:41:45 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <adrian.ratiu <AT> collabora.com> Closes: https://github.com/gentoo/gentoo/pull/26747 Signed-off-by: Sam James <sam <AT> 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} )
