| 1 |
commit: 00a8e87b3afc16af56632d08884263623800bd99 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 25 21:16:14 2019 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 25 21:16:43 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00a8e87b |
| 7 |
|
| 8 |
sys-libs/glibc: avoid libidn2 in bootstrap, bug #681742 |
| 9 |
|
| 10 |
When bootstrapping a cross-toolchain don't pull in libidn2 into |
| 11 |
the host as it's not stable yet everywhere (requires KEYWORDS |
| 12 |
fiddling) and is not needed on host (it's cross-glibc). |
| 13 |
|
| 14 |
Reported-by: Mahmoud Jaoune |
| 15 |
Bug: https://bugs.gentoo.org/681742 |
| 16 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 17 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 18 |
|
| 19 |
sys-libs/glibc/glibc-2.28-r5.ebuild | 6 ++++-- |
| 20 |
sys-libs/glibc/glibc-2.29-r1.ebuild | 6 ++++-- |
| 21 |
sys-libs/glibc/glibc-2.29.ebuild | 6 ++++-- |
| 22 |
sys-libs/glibc/glibc-9999.ebuild | 6 ++++-- |
| 23 |
4 files changed, 16 insertions(+), 8 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild |
| 26 |
index 2bdf8ec2bb5..b006cb19449 100644 |
| 27 |
--- a/sys-libs/glibc/glibc-2.28-r5.ebuild |
| 28 |
+++ b/sys-libs/glibc/glibc-2.28-r5.ebuild |
| 29 |
@@ -82,7 +82,6 @@ DEPEND="${COMMON_DEPEND} |
| 30 |
test? ( >=net-dns/libidn2-2.0.5 ) |
| 31 |
" |
| 32 |
RDEPEND="${COMMON_DEPEND} |
| 33 |
- >=net-dns/libidn2-2.0.5 |
| 34 |
sys-apps/gentoo-functions |
| 35 |
!sys-kernel/ps3-sources |
| 36 |
!sys-libs/nss-db |
| 37 |
@@ -100,7 +99,10 @@ else |
| 38 |
>=sys-devel/gcc-6 |
| 39 |
virtual/os-headers |
| 40 |
" |
| 41 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
| 42 |
+ RDEPEND+=" |
| 43 |
+ >=net-dns/libidn2-2.0.5 |
| 44 |
+ vanilla? ( !sys-libs/timezone-data ) |
| 45 |
+ " |
| 46 |
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
| 47 |
fi |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/sys-libs/glibc/glibc-2.29-r1.ebuild b/sys-libs/glibc/glibc-2.29-r1.ebuild |
| 51 |
index eba80bd41ff..1beb44e7ca9 100644 |
| 52 |
--- a/sys-libs/glibc/glibc-2.29-r1.ebuild |
| 53 |
+++ b/sys-libs/glibc/glibc-2.29-r1.ebuild |
| 54 |
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND} |
| 55 |
test? ( >=net-dns/libidn2-2.0.5 ) |
| 56 |
" |
| 57 |
RDEPEND="${COMMON_DEPEND} |
| 58 |
- >=net-dns/libidn2-2.0.5 |
| 59 |
sys-apps/gentoo-functions |
| 60 |
!sys-kernel/ps3-sources |
| 61 |
!sys-libs/nss-db |
| 62 |
@@ -104,7 +103,10 @@ else |
| 63 |
>=sys-devel/gcc-6 |
| 64 |
virtual/os-headers |
| 65 |
" |
| 66 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
| 67 |
+ RDEPEND+=" |
| 68 |
+ >=net-dns/libidn2-2.0.5 |
| 69 |
+ vanilla? ( !sys-libs/timezone-data ) |
| 70 |
+ " |
| 71 |
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
| 72 |
fi |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/sys-libs/glibc/glibc-2.29.ebuild b/sys-libs/glibc/glibc-2.29.ebuild |
| 76 |
index 98113f0210b..e2028c49d8f 100644 |
| 77 |
--- a/sys-libs/glibc/glibc-2.29.ebuild |
| 78 |
+++ b/sys-libs/glibc/glibc-2.29.ebuild |
| 79 |
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND} |
| 80 |
test? ( >=net-dns/libidn2-2.0.5 ) |
| 81 |
" |
| 82 |
RDEPEND="${COMMON_DEPEND} |
| 83 |
- >=net-dns/libidn2-2.0.5 |
| 84 |
sys-apps/gentoo-functions |
| 85 |
!sys-kernel/ps3-sources |
| 86 |
!sys-libs/nss-db |
| 87 |
@@ -104,7 +103,10 @@ else |
| 88 |
>=sys-devel/gcc-6 |
| 89 |
virtual/os-headers |
| 90 |
" |
| 91 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
| 92 |
+ RDEPEND+=" |
| 93 |
+ >=net-dns/libidn2-2.0.5 |
| 94 |
+ vanilla? ( !sys-libs/timezone-data ) |
| 95 |
+ " |
| 96 |
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
| 97 |
fi |
| 98 |
|
| 99 |
|
| 100 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 101 |
index 417b38d3008..478b5e5c9dc 100644 |
| 102 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 103 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 104 |
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND} |
| 105 |
test? ( >=net-dns/libidn2-2.0.5 ) |
| 106 |
" |
| 107 |
RDEPEND="${COMMON_DEPEND} |
| 108 |
- >=net-dns/libidn2-2.0.5 |
| 109 |
sys-apps/gentoo-functions |
| 110 |
!sys-kernel/ps3-sources |
| 111 |
!sys-libs/nss-db |
| 112 |
@@ -104,7 +103,10 @@ else |
| 113 |
>=sys-devel/gcc-6 |
| 114 |
virtual/os-headers |
| 115 |
" |
| 116 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
| 117 |
+ RDEPEND+=" |
| 118 |
+ >=net-dns/libidn2-2.0.5 |
| 119 |
+ vanilla? ( !sys-libs/timezone-data ) |
| 120 |
+ " |
| 121 |
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
| 122 |
fi |
Archives