| 1 |
commit: 77cec48da70c6d6424ed6dba4357dd8eacd262c2 |
| 2 |
Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> |
| 3 |
AuthorDate: Fri Aug 5 12:41:45 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 20 00:58:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cec48d |
| 7 |
|
| 8 |
sys-libs/glibc: make crypt.h install depend on crypt use flag |
| 9 |
|
| 10 |
The crypt use flag is supposed to control whether libcrypt |
| 11 |
and its associated crypt.h are installed, but it's ignored |
| 12 |
in header-only builds and crypt.h is always installed. |
| 13 |
|
| 14 |
This generates a conflict for eg with sys-libs/libcxrypt |
| 15 |
installed as a system lib which provides /usr/include/crypt.h |
| 16 |
even if glibc is built with -crypt. |
| 17 |
|
| 18 |
The solution is for glibc to properly respect the crypt |
| 19 |
use flag when installing the headers. |
| 20 |
|
| 21 |
Fixes: https://bugs.gentoo.org/863812 |
| 22 |
Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com> |
| 23 |
Closes: https://github.com/gentoo/gentoo/pull/26747 |
| 24 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 25 |
|
| 26 |
sys-libs/glibc/{glibc-2.33-r13.ebuild => glibc-2.33-r14.ebuild} | 1 + |
| 27 |
sys-libs/glibc/{glibc-2.34-r13.ebuild => glibc-2.34-r14.ebuild} | 1 + |
| 28 |
sys-libs/glibc/glibc-2.35-r8.ebuild | 1 + |
| 29 |
sys-libs/glibc/glibc-2.36.ebuild | 1 + |
| 30 |
sys-libs/glibc/glibc-9999.ebuild | 1 + |
| 31 |
5 files changed, 5 insertions(+) |
| 32 |
|
| 33 |
diff --git a/sys-libs/glibc/glibc-2.33-r13.ebuild b/sys-libs/glibc/glibc-2.33-r14.ebuild |
| 34 |
similarity index 99% |
| 35 |
rename from sys-libs/glibc/glibc-2.33-r13.ebuild |
| 36 |
rename to sys-libs/glibc/glibc-2.33-r14.ebuild |
| 37 |
index 9fd5d468641c..98877549d384 100644 |
| 38 |
--- a/sys-libs/glibc/glibc-2.33-r13.ebuild |
| 39 |
+++ b/sys-libs/glibc/glibc-2.33-r14.ebuild |
| 40 |
@@ -1131,6 +1131,7 @@ glibc_headers_configure() { |
| 41 |
--host=${CTARGET_OPT:-${CTARGET}} |
| 42 |
--with-headers=$(build_eprefix)$(alt_build_headers) |
| 43 |
--prefix="$(host_eprefix)/usr" |
| 44 |
+ $(use_enable crypt) |
| 45 |
${EXTRA_ECONF} |
| 46 |
) |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/sys-libs/glibc/glibc-2.34-r13.ebuild b/sys-libs/glibc/glibc-2.34-r14.ebuild |
| 50 |
similarity index 99% |
| 51 |
rename from sys-libs/glibc/glibc-2.34-r13.ebuild |
| 52 |
rename to sys-libs/glibc/glibc-2.34-r14.ebuild |
| 53 |
index 1cd002c9c54a..454796952613 100644 |
| 54 |
--- a/sys-libs/glibc/glibc-2.34-r13.ebuild |
| 55 |
+++ b/sys-libs/glibc/glibc-2.34-r14.ebuild |
| 56 |
@@ -1149,6 +1149,7 @@ glibc_headers_configure() { |
| 57 |
--host=${CTARGET_OPT:-${CTARGET}} |
| 58 |
--with-headers=$(build_eprefix)$(alt_build_headers) |
| 59 |
--prefix="$(host_eprefix)/usr" |
| 60 |
+ $(use_enable crypt) |
| 61 |
${EXTRA_ECONF} |
| 62 |
) |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/sys-libs/glibc/glibc-2.35-r8.ebuild b/sys-libs/glibc/glibc-2.35-r8.ebuild |
| 66 |
index 25a735d93196..9ae33c6fc9d5 100644 |
| 67 |
--- a/sys-libs/glibc/glibc-2.35-r8.ebuild |
| 68 |
+++ b/sys-libs/glibc/glibc-2.35-r8.ebuild |
| 69 |
@@ -1142,6 +1142,7 @@ glibc_headers_configure() { |
| 70 |
--host=${CTARGET_OPT:-${CTARGET}} |
| 71 |
--with-headers=$(build_eprefix)$(alt_build_headers) |
| 72 |
--prefix="$(host_eprefix)/usr" |
| 73 |
+ $(use_enable crypt) |
| 74 |
${EXTRA_ECONF} |
| 75 |
) |
| 76 |
|
| 77 |
|
| 78 |
diff --git a/sys-libs/glibc/glibc-2.36.ebuild b/sys-libs/glibc/glibc-2.36.ebuild |
| 79 |
index dc52203e0fe7..1ef2d277f251 100644 |
| 80 |
--- a/sys-libs/glibc/glibc-2.36.ebuild |
| 81 |
+++ b/sys-libs/glibc/glibc-2.36.ebuild |
| 82 |
@@ -1140,6 +1140,7 @@ glibc_headers_configure() { |
| 83 |
--host=${CTARGET_OPT:-${CTARGET}} |
| 84 |
--with-headers=$(build_eprefix)$(alt_build_headers) |
| 85 |
--prefix="$(host_eprefix)/usr" |
| 86 |
+ $(use_enable crypt) |
| 87 |
${EXTRA_ECONF} |
| 88 |
) |
| 89 |
|
| 90 |
|
| 91 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 92 |
index 92b54a5a254a..6797fdf6cd8a 100644 |
| 93 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 94 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 95 |
@@ -1140,6 +1140,7 @@ glibc_headers_configure() { |
| 96 |
--host=${CTARGET_OPT:-${CTARGET}} |
| 97 |
--with-headers=$(build_eprefix)$(alt_build_headers) |
| 98 |
--prefix="$(host_eprefix)/usr" |
| 99 |
+ $(use_enable crypt) |
| 100 |
${EXTRA_ECONF} |
| 101 |
) |
Archives