summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-03-25 21:16:14 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-03-25 21:16:43 +0000
commit00a8e87b3afc16af56632d08884263623800bd99 (patch)
tree107154efd71ad38e5fe31affbc1981bc9d666d95 /sys-libs
parentnet-firewall/firehol: amd64 stable wrt bug #681106 (diff)
downloadgentoo-00a8e87b3afc16af56632d08884263623800bd99.tar.gz
gentoo-00a8e87b3afc16af56632d08884263623800bd99.tar.bz2
gentoo-00a8e87b3afc16af56632d08884263623800bd99.zip
sys-libs/glibc: avoid libidn2 in bootstrap, bug #681742
When bootstrapping a cross-toolchain don't pull in libidn2 into the host as it's not stable yet everywhere (requires KEYWORDS fiddling) and is not needed on host (it's cross-glibc). Reported-by: Mahmoud Jaoune Bug: https://bugs.gentoo.org/681742 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/glibc-2.28-r5.ebuild6
-rw-r--r--sys-libs/glibc/glibc-2.29-r1.ebuild6
-rw-r--r--sys-libs/glibc/glibc-2.29.ebuild6
-rw-r--r--sys-libs/glibc/glibc-9999.ebuild6
4 files changed, 16 insertions, 8 deletions
diff --git a/sys-libs/glibc/glibc-2.28-r5.ebuild b/sys-libs/glibc/glibc-2.28-r5.ebuild
index 2bdf8ec2bb5f..b006cb19449c 100644
--- a/sys-libs/glibc/glibc-2.28-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.28-r5.ebuild
@@ -82,7 +82,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=net-dns/libidn2-2.0.5 )
"
RDEPEND="${COMMON_DEPEND}
- >=net-dns/libidn2-2.0.5
sys-apps/gentoo-functions
!sys-kernel/ps3-sources
!sys-libs/nss-db
@@ -100,7 +99,10 @@ else
>=sys-devel/gcc-6
virtual/os-headers
"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+ RDEPEND+="
+ >=net-dns/libidn2-2.0.5
+ vanilla? ( !sys-libs/timezone-data )
+ "
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
fi
diff --git a/sys-libs/glibc/glibc-2.29-r1.ebuild b/sys-libs/glibc/glibc-2.29-r1.ebuild
index eba80bd41ff2..1beb44e7ca9f 100644
--- a/sys-libs/glibc/glibc-2.29-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r1.ebuild
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=net-dns/libidn2-2.0.5 )
"
RDEPEND="${COMMON_DEPEND}
- >=net-dns/libidn2-2.0.5
sys-apps/gentoo-functions
!sys-kernel/ps3-sources
!sys-libs/nss-db
@@ -104,7 +103,10 @@ else
>=sys-devel/gcc-6
virtual/os-headers
"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+ RDEPEND+="
+ >=net-dns/libidn2-2.0.5
+ vanilla? ( !sys-libs/timezone-data )
+ "
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
fi
diff --git a/sys-libs/glibc/glibc-2.29.ebuild b/sys-libs/glibc/glibc-2.29.ebuild
index 98113f0210bf..e2028c49d8fd 100644
--- a/sys-libs/glibc/glibc-2.29.ebuild
+++ b/sys-libs/glibc/glibc-2.29.ebuild
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=net-dns/libidn2-2.0.5 )
"
RDEPEND="${COMMON_DEPEND}
- >=net-dns/libidn2-2.0.5
sys-apps/gentoo-functions
!sys-kernel/ps3-sources
!sys-libs/nss-db
@@ -104,7 +103,10 @@ else
>=sys-devel/gcc-6
virtual/os-headers
"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+ RDEPEND+="
+ >=net-dns/libidn2-2.0.5
+ vanilla? ( !sys-libs/timezone-data )
+ "
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
fi
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 417b38d30088..478b5e5c9dc6 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -86,7 +86,6 @@ DEPEND="${COMMON_DEPEND}
test? ( >=net-dns/libidn2-2.0.5 )
"
RDEPEND="${COMMON_DEPEND}
- >=net-dns/libidn2-2.0.5
sys-apps/gentoo-functions
!sys-kernel/ps3-sources
!sys-libs/nss-db
@@ -104,7 +103,10 @@ else
>=sys-devel/gcc-6
virtual/os-headers
"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
+ RDEPEND+="
+ >=net-dns/libidn2-2.0.5
+ vanilla? ( !sys-libs/timezone-data )
+ "
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
fi