From: Sergei Trofimovich Date: Sun, 7 Jan 2018 18:43:58 +0000 (+0000) Subject: sys-libs/glibc: Migrate CROSSCOMPILE_OPTS=headers-only -> USE=headers-only X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=91a02442c5a6c157bf9de58b20d327c88e9fac20;p=gentoo.git sys-libs/glibc: Migrate CROSSCOMPILE_OPTS=headers-only -> USE=headers-only CROSSCOMPILE_OPTS is a USE_EXPAND of a single item: headers-only. Convert it to a global USE flag instead. Mechanical ebuild rename done as: $ sed -e 's@crosscompile_opts_headers-only@headers-only@g' \ -i $(git grep -l headers-only) 'headers-only' flag is used by crossdev to bootstrap stage1 compiler before libc is available. crossdev switched to USE=headers-only in =sys-devel/crossdev-20171230. Bug: https://bugs.gentoo.org/642712 Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- diff --git a/sys-libs/glibc/glibc-2.18-r1.ebuild b/sys-libs/glibc/glibc-2.18-r1.ebuild index a9c0bfc2c2b7..a056ef575af5 100644 --- a/sys-libs/glibc/glibc-2.18-r1.ebuild +++ b/sys-libs/glibc/glibc-2.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit toolchain-glibc @@ -27,7 +27,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="4" # Gentoo patchset NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -72,7 +72,7 @@ RDEPEND="!sys-kernel/ps3-sources !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.20 >=${CATEGORY}/gcc-4.3 )" diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild index 8860850c0224..a2b10e2a5c15 100644 --- a/sys-libs/glibc/glibc-2.19-r1.ebuild +++ b/sys-libs/glibc/glibc-2.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 inherit toolchain-glibc @@ -27,7 +27,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="3" # Gentoo patchset NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -72,7 +72,7 @@ RDEPEND="!sys-kernel/ps3-sources !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.20 >=${CATEGORY}/gcc-4.3 )" diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild index 04363835f616..2c35723c25b2 100644 --- a/sys-libs/glibc/glibc-2.20-r2.ebuild +++ b/sys-libs/glibc/glibc-2.20-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -29,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="5" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -73,7 +73,7 @@ RDEPEND="!sys-kernel/ps3-sources !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.4 )" diff --git a/sys-libs/glibc/glibc-2.21-r2.ebuild b/sys-libs/glibc/glibc-2.21-r2.ebuild index 9216657a9703..6db7c6a78833 100644 --- a/sys-libs/glibc/glibc-2.21-r2.ebuild +++ b/sys-libs/glibc/glibc-2.21-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -29,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="7" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -73,7 +73,7 @@ RDEPEND="!sys-kernel/ps3-sources !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.6 )" diff --git a/sys-libs/glibc/glibc-2.22-r4.ebuild b/sys-libs/glibc/glibc-2.22-r4.ebuild index 5949f88d64ac..416fec87178b 100644 --- a/sys-libs/glibc/glibc-2.22-r4.ebuild +++ b/sys-libs/glibc/glibc-2.22-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -29,7 +29,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="13" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -73,7 +73,7 @@ RDEPEND="!sys-kernel/ps3-sources !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.6 )" diff --git a/sys-libs/glibc/glibc-2.23-r4.ebuild b/sys-libs/glibc/glibc-2.23-r4.ebuild index 01efec5a7b42..18fe392f108e 100644 --- a/sys-libs/glibc/glibc-2.23-r4.ebuild +++ b/sys-libs/glibc/glibc-2.23-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="8" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -82,7 +82,7 @@ RDEPEND="${COMMON_DEPEND} !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.7 )" diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild index 29a17f827aec..eb338ca1447b 100644 --- a/sys-libs/glibc/glibc-2.24-r4.ebuild +++ b/sys-libs/glibc/glibc-2.24-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -30,7 +30,7 @@ GCC_BOOTSTRAP_VER="4.7.3-r1" PATCH_VER="10" # Gentoo patchset : ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -82,7 +82,7 @@ RDEPEND="${COMMON_DEPEND} !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.7 )" diff --git a/sys-libs/glibc/glibc-2.25-r10.ebuild b/sys-libs/glibc/glibc-2.25-r10.ebuild index 71709c387e75..89b89e762404 100644 --- a/sys-libs/glibc/glibc-2.25-r10.ebuild +++ b/sys-libs/glibc/glibc-2.25-r10.ebuild @@ -32,7 +32,7 @@ PATCH_VER="13" # Gentoo patchset GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch" -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -85,7 +85,7 @@ RDEPEND="${COMMON_DEPEND} !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.7 )" diff --git a/sys-libs/glibc/glibc-2.25-r9.ebuild b/sys-libs/glibc/glibc-2.25-r9.ebuild index 62c5c1ac0cfd..e31acb3be955 100644 --- a/sys-libs/glibc/glibc-2.25-r9.ebuild +++ b/sys-libs/glibc/glibc-2.25-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -32,7 +32,7 @@ PATCH_VER="12" # Gentoo patchset GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch" -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only" # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -85,7 +85,7 @@ RDEPEND="${COMMON_DEPEND} !sys-libs/nss-db" if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.7 )" diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild index b936a612e1fb..84dc10f40557 100644 --- a/sys-libs/glibc/glibc-2.26-r3.ebuild +++ b/sys-libs/glibc/glibc-2.26-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,7 +32,7 @@ PATCH_VER=4 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )" -IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Min kernel version glibc requires : ${NPTL_KERN_VER:="3.2.0"} @@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND} " if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.9 )" diff --git a/sys-libs/glibc/glibc-2.26-r5.ebuild b/sys-libs/glibc/glibc-2.26-r5.ebuild index c5a076afbdb0..4eb6b34679f5 100644 --- a/sys-libs/glibc/glibc-2.26-r5.ebuild +++ b/sys-libs/glibc/glibc-2.26-r5.ebuild @@ -32,7 +32,7 @@ PATCH_VER=5 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )" -IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Min kernel version glibc requires : ${NPTL_KERN_VER:="3.2.0"} @@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEPEND} " if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.9 )" diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 2aed938db026..5d7f3a9fbe9d 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ PATCH_VER="3" SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )" -IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" +IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" # Min kernel version glibc requires : ${NPTL_KERN_VER:="3.2.0"} @@ -65,7 +65,7 @@ is_crosscompile() { } just_headers() { - is_crosscompile && use crosscompile_opts_headers-only + is_crosscompile && use headers-only } SLOT="2.2" @@ -94,7 +94,7 @@ RDEPEND="${COMMON_DEPEND} " if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( + DEPEND+=" !headers-only? ( >=${CATEGORY}/binutils-2.24 >=${CATEGORY}/gcc-4.9 )"