From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 043AF1381F3 for ; Sat, 30 Dec 2017 18:48:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8DC4E0904; Sat, 30 Dec 2017 18:48:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FD86E08EE for ; Sat, 30 Dec 2017 18:48:35 +0000 (UTC) Received: from sf.home (trofi-1-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0f::2]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id E851F335C33; Sat, 30 Dec 2017 18:48:31 +0000 (UTC) Received: by sf.home (Postfix, from userid 1000) id ED2B01CD2EADB; Sat, 30 Dec 2017 18:48:25 +0000 (GMT) From: Sergei Trofimovich To: gentoo-dev@lists.gentoo.org Cc: Sergei Trofimovich , toolchain@gentoo.org, embedded@gentoo.org, kernel@gentoo.org, bsd@gentoo.org, blueness@gentoo.org, lu_zero@gentoo.org Subject: [gentoo-dev] [PATCH] Migrate CROSSCOMPILE_OPTS=headers-only -> USE=headers-only Date: Sat, 30 Dec 2017 18:48:02 +0000 Message-Id: <20171230184802.10775-1-slyfox@gentoo.org> X-Mailer: git-send-email 2.15.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 81395177-ef48-4595-afe9-9bb045a6deae X-Archives-Hash: a07f969332eb2e318526ba90643ebf15 CROSSCOMPILE_OPTS is a USE_EXPAND of a single item: headers-only. Convert it to a global USE flag instead. The changes are: - mechanical ebuild rename (touches libcs and kernel headers): $ sed -e 's@crosscompile_opts_headers-only@headers-only@g' \ -i $(git grep -l headers-only) - added global 'headers-only' USE - CROSSCOMPILE_OPTS USE_EXPAND is removed '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. After crossdev goes stable this change can go in. CC: toolchain@gentoo.org CC: embedded@gentoo.org CC: kernel@gentoo.org CC: bsd@gentoo.org CC: blueness@gentoo.org CC: lu_zero@gentoo.org Reported-by: Michał Górny Bug: https://bugs.gentoo.org/642712 Signed-off-by: Sergei Trofimovich --- dev-embedded/avr-libc/avr-libc-2.0.0.ebuild | 2 +- dev-libs/cygwin/cygwin-1.5.25.15.ebuild | 8 ++++---- dev-util/mingw-runtime/mingw-runtime-3.18.ebuild | 4 ++-- dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild | 4 ++-- dev-util/mingw-runtime/mingw-runtime-3.20.ebuild | 4 ++-- dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild | 4 ++-- dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild | 4 ++-- dev-util/w32api/w32api-3.17.2.ebuild | 4 ++-- dev-util/w32api/w32api-4.0.3.1.ebuild | 4 ++-- eclass/kernel-2.eclass | 4 ++-- eclass/toolchain-glibc.eclass | 2 +- eclass/toolchain.eclass | 2 +- profiles/base/make.defaults | 4 ++-- profiles/desc/crosscompile_opts.desc | 8 -------- profiles/embedded/make.defaults | 4 ++-- profiles/use.desc | 1 + sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild | 6 +++--- sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild | 6 +++--- sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild | 6 +++--- sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild | 6 +++--- sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild | 6 +++--- sys-libs/glibc/glibc-2.18-r1.ebuild | 4 ++-- sys-libs/glibc/glibc-2.19-r1.ebuild | 4 ++-- sys-libs/glibc/glibc-2.20-r2.ebuild | 4 ++-- sys-libs/glibc/glibc-2.21-r2.ebuild | 4 ++-- sys-libs/glibc/glibc-2.22-r4.ebuild | 4 ++-- sys-libs/glibc/glibc-2.23-r4.ebuild | 4 ++-- sys-libs/glibc/glibc-2.24-r4.ebuild | 4 ++-- sys-libs/glibc/glibc-2.25-r10.ebuild | 4 ++-- sys-libs/glibc/glibc-2.25-r9.ebuild | 4 ++-- sys-libs/glibc/glibc-2.26-r3.ebuild | 4 ++-- sys-libs/glibc/glibc-2.26-r4.ebuild | 4 ++-- sys-libs/glibc/glibc-9999.ebuild | 6 +++--- sys-libs/musl/musl-1.1.18-r1.ebuild | 4 ++-- sys-libs/musl/musl-1.1.18.ebuild | 4 ++-- sys-libs/musl/musl-9999.ebuild | 4 ++-- sys-libs/newlib/newlib-2.0.0.ebuild | 2 +- sys-libs/newlib/newlib-2.1.0.ebuild | 2 +- sys-libs/newlib/newlib-2.2.0.20150423.ebuild | 2 +- sys-libs/newlib/newlib-2.2.0.ebuild | 2 +- sys-libs/newlib/newlib-2.3.0.20160104.ebuild | 2 +- sys-libs/newlib/newlib-2.4.0.ebuild | 2 +- sys-libs/newlib/newlib-2.5.0.ebuild | 2 +- sys-libs/newlib/newlib-9999.ebuild | 2 +- sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild | 4 ++-- sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild | 4 ++-- sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild | 4 ++-- sys-libs/uclibc-ng/uclibc-ng-9999.ebuild | 4 ++-- sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 4 ++-- sys-libs/uclibc/uclibc-0.9.33.9999.ebuild | 4 ++-- sys-libs/uclibc/uclibc-9999.ebuild | 4 ++-- 62 files changed, 118 insertions(+), 125 deletions(-) delete mode 100644 profiles/desc/crosscompile_opts.desc diff --git a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild index 3bc1167bdf6..ece4a7aef2c 100644 --- a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild +++ b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild @@ -20,7 +20,7 @@ SLOT="0" # be any other arch. See bug #620316#c5 # Don't add more arches to KEYWORDS. KEYWORDS="amd64" -IUSE="doc crosscompile_opts_headers-only" +IUSE="doc headers-only" DEPEND=">=sys-devel/crossdev-0.9.1" [[ ${CATEGORY/cross-} != ${CATEGORY} ]] \ diff --git a/dev-libs/cygwin/cygwin-1.5.25.15.ebuild b/dev-libs/cygwin/cygwin-1.5.25.15.ebuild index bc05e39d191..d533cd80dfe 100644 --- a/dev-libs/cygwin/cygwin-1.5.25.15.ebuild +++ b/dev-libs/cygwin/cygwin-1.5.25.15.ebuild @@ -15,8 +15,8 @@ W32API_BIN="3.12-1" MY_P="${PN}-${PV%.*}-${PV##*.}" DESCRIPTION="Linux-like environment for Windows" HOMEPAGE="http://cygwin.com/" -SRC_URI="!crosscompile_opts_headers-only? ( ftp://sourceware.org/pub/cygwin/release/cygwin/${MY_P}-src.tar.bz2 ) - crosscompile_opts_headers-only? ( +SRC_URI="!headers-only? ( ftp://sourceware.org/pub/cygwin/release/cygwin/${MY_P}-src.tar.bz2 ) + headers-only? ( ftp://sourceware.org/pub/cygwin/release/w32api/w32api-${W32API_BIN}.tar.bz2 ftp://sourceware.org/pub/cygwin/release/cygwin/${MY_P}.tar.bz2 )" @@ -24,7 +24,7 @@ SRC_URI="!crosscompile_opts_headers-only? ( ftp://sourceware.org/pub/cygwin/rele LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" DEPEND="" @@ -32,7 +32,7 @@ DEPEND="" S=${WORKDIR} just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild index fb7b3aaaadb..fc9140ab015 100644 --- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild +++ b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" S=${WORKDIR}/${MY_P} @@ -28,7 +28,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild index 21f0e6d6c3b..d15d60bc5b8 100644 --- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild +++ b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" DEPEND="app-arch/xz-utils" @@ -33,7 +33,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild index d456e763daa..863032b622a 100644 --- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild +++ b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" S=${WORKDIR}/${MY_P} @@ -31,7 +31,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild index 29cc5a87519..789ae8c2b27 100644 --- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild +++ b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild @@ -23,7 +23,7 @@ LICENSE="BSD" SLOT="0" # Collides with w32api-4.x #KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" DEPEND="app-arch/xz-utils" @@ -35,7 +35,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild index ce8f87cddc9..c2c96009fd2 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl" +IUSE="headers-only idl" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -29,7 +29,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild index ce8f87cddc9..c2c96009fd2 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl" +IUSE="headers-only idl" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -29,7 +29,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild index ce8f87cddc9..c2c96009fd2 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl" +IUSE="headers-only idl" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -29,7 +29,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild index b298a1a5304..59500c19b65 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -31,7 +31,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild index 2fc6dd78d67..a77e0bc5fb2 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -31,7 +31,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild index 8b0d38b204c..9243189f3b7 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -31,7 +31,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild index 408aa8d8e7b..11fc903414b 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -36,7 +36,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild index 534091fe654..ff736d820e8 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -37,7 +37,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild index 0edd83c0035..be2dcba5be3 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -38,7 +38,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild index 408aa8d8e7b..11fc903414b 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -36,7 +36,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild index 1b9f05639b8..184b96411d9 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -35,7 +35,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild index a21054499a0..0b21bed2eea 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="crosscompile_opts_headers-only idl libraries tools" +IUSE="headers-only idl libraries tools" RESTRICT="strip" S="${WORKDIR}/mingw-w64-v${PV}" @@ -35,7 +35,7 @@ is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] } just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } crt_with() { just_headers && echo --without-$1 || echo --with-$1 diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild index c04ebdcfad7..65d6ddfc5de 100644 --- a/dev-util/w32api/w32api-3.17.2.ebuild +++ b/dev-util/w32api/w32api-3.17.2.ebuild @@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" DEPEND="app-arch/xz-utils" @@ -29,7 +29,7 @@ RDEPEND="" S=${WORKDIR}/${MY_P} just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild index 0d8deb3895a..4ba9dc7b032 100644 --- a/dev-util/w32api/w32api-4.0.3.1.ebuild +++ b/dev-util/w32api/w32api-4.0.3.1.ebuild @@ -23,7 +23,7 @@ LICENSE="BSD" SLOT="0" # Collides with mingw-runtime-4.x #KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" RESTRICT="strip" DEPEND="app-arch/xz-utils" @@ -32,7 +32,7 @@ RDEPEND="" S=${WORKDIR}/${MY_P/-m/.m}-src just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } pkg_setup() { diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 84909f30ca3..bcbbc1fc4cc 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -667,7 +667,7 @@ if [[ ${ETYPE} == sources ]]; then elif [[ ${ETYPE} == headers ]]; then DESCRIPTION="Linux system headers" - IUSE="crosscompile_opts_headers-only" + IUSE="headers-only" # Since we should NOT honour KBUILD_OUTPUT in headers # lets unset it here. @@ -693,7 +693,7 @@ kernel_header_destdir() { # @DESCRIPTION: # set use if necessary for cross compile support cross_pre_c_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] + use headers-only && [[ ${CHOST} != ${CTARGET} ]] } # @FUNCTION: env_setup_xmakeopts diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass index d9c692f2ad8..fb7092daa97 100644 --- a/eclass/toolchain-glibc.eclass +++ b/eclass/toolchain-glibc.eclass @@ -398,7 +398,7 @@ foreach_abi() { } just_headers() { - is_crosscompile && use crosscompile_opts_headers-only + is_crosscompile && use headers-only } glibc_banner() { diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a038303ec7f..e88ad299e9c 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -998,7 +998,7 @@ toolchain_src_configure() { --disable-threads --without-headers ) - elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then + elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} headers-only ; then confgcc+=( "${confgcc_no_libc[@]}" --with-sysroot="${PREFIX}"/${CTARGET} diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index db5f5389791..8df5fb60cb0 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" diff --git a/profiles/desc/crosscompile_opts.desc b/profiles/desc/crosscompile_opts.desc deleted file mode 100644 index 1923d8b13e8..00000000000 --- a/profiles/desc/crosscompile_opts.desc +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This file contains descriptions of CROSSCOMPILE_OPTS USE_EXPAND flags. - -# Keep it sorted. - -headers-only - Build the toolchain against cross-headers only. diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 1145142fe4a..77bdb2645cd 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -27,11 +27,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" # Variables that are set exclusively by the profile # and not by user configuration files. diff --git a/profiles/use.desc b/profiles/use.desc index 40c9747f2b5..bffd3b60d94 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -135,6 +135,7 @@ handbook - Enable handbooks generation for packages by KDE hardened - Activate default security enhancements for toolchain (gcc, glibc, binutils) hddtemp - Enable monitoring of hdd temperature (app-admin/hddtemp) hdf5 - Add support for the Hierarchical Data Format v5 +headers-only - Install only C headers instead of whole package. Mainly used by sys-devel/crossdev for toolchain bootstrap. hscolour - Include coloured haskell sources to generated documentation (dev-haskell/hscolour) ibm - Add support for IBM ppc64 specific systems iconv - Enable support for the iconv character set conversion library diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild index 96b62502268..b6b4942bd1e 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild @@ -71,7 +71,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs + build headers-only zfs userland_GNU userland_BSD" QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" @@ -374,7 +374,7 @@ src_compile() { cd "${WORKDIR}/include" $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" - use crosscompile_opts_headers-only && return 0 + use headers-only && return 0 # Bug #270098 append-flags $(test-flags -fno-strict-aliasing) @@ -504,7 +504,7 @@ do_install() { CTARGET="${CHOST}" \ install_includes ${INCLUDEDIR} - is_crosscompile && use crosscompile_opts_headers-only && return 0 + is_crosscompile && use headers-only && return 0 # Install a libusb.pc for better compat with Linux's libusb if use usb ; then diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild index 24c62627e2a..aede185dc64 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild @@ -70,7 +70,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs + build headers-only zfs userland_GNU userland_BSD" QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" @@ -368,7 +368,7 @@ src_compile() { cd "${WORKDIR}/include" $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" - use crosscompile_opts_headers-only && return 0 + use headers-only && return 0 # Bug #270098 append-flags $(test-flags -fno-strict-aliasing) @@ -498,7 +498,7 @@ do_install() { CTARGET="${CHOST}" \ install_includes ${INCLUDEDIR} - is_crosscompile && use crosscompile_opts_headers-only && return 0 + is_crosscompile && use headers-only && return 0 # Install a libusb.pc for better compat with Linux's libusb if use usb ; then diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild index a1e2b461df4..f7ffe3e6e13 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild @@ -72,7 +72,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs pam xinetd + build headers-only zfs pam xinetd userland_GNU userland_BSD" QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" @@ -416,7 +416,7 @@ src_compile() { cd "${WORKDIR}/include" $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" - use crosscompile_opts_headers-only && return 0 + use headers-only && return 0 # Bug #270098 append-flags $(test-flags -fno-strict-aliasing) @@ -547,7 +547,7 @@ do_install() { CTARGET="${CHOST}" \ install_includes ${INCLUDEDIR} - is_crosscompile && use crosscompile_opts_headers-only && return 0 + is_crosscompile && use headers-only && return 0 # Install a libusb.pc for better compat with Linux's libusb if use usb ; then diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild index 755c53b8497..1643df35bd3 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild @@ -51,7 +51,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build bootstrap crosscompile_opts_headers-only" + build bootstrap headers-only" pkg_setup() { [ -c /dev/zero ] || \ @@ -193,7 +193,7 @@ src_compile() { cd "${WORKDIR}/include" $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" - use crosscompile_opts_headers-only && return 0 + use headers-only && return 0 # Bug #270098 append-flags $(test-flags -fno-strict-aliasing) @@ -275,7 +275,7 @@ src_install() { doins "${S}/msun/src/math.h" fi - use crosscompile_opts_headers-only && return 0 + use headers-only && return 0 local mylibdir=$(get_libdir) if [ "${CTARGET}" != "${CHOST}" ]; then diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild index 8eee4f7d190..44d4aa0baed 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild @@ -54,7 +54,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs + build headers-only zfs userland_GNU userland_BSD" QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" @@ -358,7 +358,7 @@ src_compile() { cd "${WORKDIR}/include" $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" - use crosscompile_opts_headers-only && return 0 + use headers-only && return 0 # Bug #270098 append-flags $(test-flags -fno-strict-aliasing) @@ -485,7 +485,7 @@ do_install() { CTARGET="${CHOST}" \ install_includes ${INCLUDEDIR} - is_crosscompile && use crosscompile_opts_headers-only && return 0 + is_crosscompile && use headers-only && return 0 for i in $(get_subdirs) ; do einfo "Installing in ${i}..." diff --git a/sys-libs/glibc/glibc-2.18-r1.ebuild b/sys-libs/glibc/glibc-2.18-r1.ebuild index a9c0bfc2c2b..e02d58f31cf 100644 --- a/sys-libs/glibc/glibc-2.18-r1.ebuild +++ b/sys-libs/glibc/glibc-2.18-r1.ebuild @@ -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 8860850c022..e6eebb4dd97 100644 --- a/sys-libs/glibc/glibc-2.19-r1.ebuild +++ b/sys-libs/glibc/glibc-2.19-r1.ebuild @@ -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 04363835f61..09d71f3bf14 100644 --- a/sys-libs/glibc/glibc-2.20-r2.ebuild +++ b/sys-libs/glibc/glibc-2.20-r2.ebuild @@ -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 9216657a970..243124cd780 100644 --- a/sys-libs/glibc/glibc-2.21-r2.ebuild +++ b/sys-libs/glibc/glibc-2.21-r2.ebuild @@ -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 5949f88d64a..5a69c926b15 100644 --- a/sys-libs/glibc/glibc-2.22-r4.ebuild +++ b/sys-libs/glibc/glibc-2.22-r4.ebuild @@ -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 01efec5a7b4..7f226d9e42e 100644 --- a/sys-libs/glibc/glibc-2.23-r4.ebuild +++ b/sys-libs/glibc/glibc-2.23-r4.ebuild @@ -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 29a17f827ae..f5828fd5a56 100644 --- a/sys-libs/glibc/glibc-2.24-r4.ebuild +++ b/sys-libs/glibc/glibc-2.24-r4.ebuild @@ -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 e8d62b3ad2d..cd7dca5e8bb 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 62c5c1ac0cf..bea68e7ab8a 100644 --- a/sys-libs/glibc/glibc-2.25-r9.ebuild +++ b/sys-libs/glibc/glibc-2.25-r9.ebuild @@ -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 b936a612e1f..7b58a82dac6 100644 --- a/sys-libs/glibc/glibc-2.26-r3.ebuild +++ b/sys-libs/glibc/glibc-2.26-r3.ebuild @@ -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-r4.ebuild b/sys-libs/glibc/glibc-2.26-r4.ebuild index 97cf7ef1cbc..620205851b3 100644 --- a/sys-libs/glibc/glibc-2.26-r4.ebuild +++ b/sys-libs/glibc/glibc-2.26-r4.ebuild @@ -33,7 +33,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"} @@ -90,7 +90,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 a5bf3b51ebc..23cde5394c8 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -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 )" diff --git a/sys-libs/musl/musl-1.1.18-r1.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild index c4a1c90aaf5..0a6dca98ebe 100644 --- a/sys-libs/musl/musl-1.1.18-r1.ebuild +++ b/sys-libs/musl/musl-1.1.18-r1.ebuild @@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a HOMEPAGE="http://www.musl-libc.org/" LICENSE="MIT LGPL-2 GPL-2" SLOT="0" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" @@ -42,7 +42,7 @@ is_crosscompile() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } pkg_setup() { diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild index a36df0d0e87..0386a42306e 100644 --- a/sys-libs/musl/musl-1.1.18.ebuild +++ b/sys-libs/musl/musl-1.1.18.ebuild @@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a HOMEPAGE="http://www.musl-libc.org/" LICENSE="MIT LGPL-2 GPL-2" SLOT="0" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" @@ -42,7 +42,7 @@ is_crosscompile() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } pkg_setup() { diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index c4a1c90aaf5..0a6dca98ebe 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -32,7 +32,7 @@ DESCRIPTION="Light, fast and simple C library focused on standards-conformance a HOMEPAGE="http://www.musl-libc.org/" LICENSE="MIT LGPL-2 GPL-2" SLOT="0" -IUSE="crosscompile_opts_headers-only" +IUSE="headers-only" QA_SONAME="/usr/lib/libc.so" QA_DT_NEEDED="/usr/lib/libc.so" @@ -42,7 +42,7 @@ is_crosscompile() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } pkg_setup() { diff --git a/sys-libs/newlib/newlib-2.0.0.ebuild b/sys-libs/newlib/newlib-2.0.0.ebuild index 1e1ee8fed86..67b546a271d 100644 --- a/sys-libs/newlib/newlib-2.0.0.ebuild +++ b/sys-libs/newlib/newlib-2.0.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" KEYWORDS="-* arm hppa m68k ~mips ppc ppc64 sh sparc x86" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/newlib/newlib-2.1.0.ebuild b/sys-libs/newlib/newlib-2.1.0.ebuild index 3ee1e7eb83e..7af9234806a 100644 --- a/sys-libs/newlib/newlib-2.1.0.ebuild +++ b/sys-libs/newlib/newlib-2.1.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" KEYWORDS="-* ~arm ~hppa ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/newlib/newlib-2.2.0.20150423.ebuild b/sys-libs/newlib/newlib-2.2.0.20150423.ebuild index df987d568b6..eb9aa3e2d96 100644 --- a/sys-libs/newlib/newlib-2.2.0.20150423.ebuild +++ b/sys-libs/newlib/newlib-2.2.0.20150423.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/newlib/newlib-2.2.0.ebuild b/sys-libs/newlib/newlib-2.2.0.ebuild index 2754fda04d9..25adb38100a 100644 --- a/sys-libs/newlib/newlib-2.2.0.ebuild +++ b/sys-libs/newlib/newlib-2.2.0.ebuild @@ -26,7 +26,7 @@ HOMEPAGE="https://sourceware.org/newlib/" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" # Handle the SLOT changes. #497344 diff --git a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild index 43c6ac3aa91..2c23a22a0a2 100644 --- a/sys-libs/newlib/newlib-2.3.0.20160104.ebuild +++ b/sys-libs/newlib/newlib-2.3.0.20160104.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/newlib/newlib-2.4.0.ebuild b/sys-libs/newlib/newlib-2.4.0.ebuild index e70a03bdcad..5b9c78fa7aa 100644 --- a/sys-libs/newlib/newlib-2.4.0.ebuild +++ b/sys-libs/newlib/newlib-2.4.0.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/newlib/newlib-2.5.0.ebuild b/sys-libs/newlib/newlib-2.5.0.ebuild index 6a325c78758..3c86b8202e1 100644 --- a/sys-libs/newlib/newlib-2.5.0.ebuild +++ b/sys-libs/newlib/newlib-2.5.0.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/newlib/newlib-9999.ebuild b/sys-libs/newlib/newlib-9999.ebuild index 6a325c78758..3c86b8202e1 100644 --- a/sys-libs/newlib/newlib-9999.ebuild +++ b/sys-libs/newlib/newlib-9999.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://sourceware.org/newlib/" LICENSE="NEWLIB LIBGLOSS GPL-2" SLOT="0" -IUSE="nls threads unicode crosscompile_opts_headers-only" +IUSE="nls threads unicode headers-only" RESTRICT="strip" NEWLIBBUILD="${WORKDIR}/build" diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild index 89d2e372716..62ee95b676a 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.25.ebuild @@ -23,7 +23,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only" RESTRICT="strip" # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage @@ -59,7 +59,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild index 89d2e372716..62ee95b676a 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.26.ebuild @@ -23,7 +23,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only" RESTRICT="strip" # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage @@ -59,7 +59,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { diff --git a/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild b/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild index 3cd7177086e..5f076f490c0 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-1.0.27.ebuild @@ -23,7 +23,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only" RESTRICT="strip" # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage @@ -59,7 +59,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { diff --git a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild index f6ad5129797..80ba0bee35a 100644 --- a/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild +++ b/sys-libs/uclibc-ng/uclibc-ng-9999.ebuild @@ -23,7 +23,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 rpc symlink-compat crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 rpc symlink-compat headers-only" RESTRICT="strip" # 1) We can't upgrade from uclibc to uclibc-ng via a soft blocker since portage @@ -59,7 +59,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild index 2702793af65..68c9f38199e 100644 --- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild @@ -27,7 +27,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only" RESTRICT="strip" # We cannot migrate between uclibc and uclibc-ng because as soon as portage @@ -49,7 +49,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild index 82d3a46528c..3d547ad8604 100644 --- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild @@ -28,7 +28,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only" RESTRICT="strip" # We cannot migrate between uclibc and uclibc-ng because as soon as portage @@ -50,7 +50,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild index fb29176b32f..efe35f4fe8c 100644 --- a/sys-libs/uclibc/uclibc-9999.ebuild +++ b/sys-libs/uclibc/uclibc-9999.ebuild @@ -27,7 +27,7 @@ fi LICENSE="LGPL-2" SLOT="0" -IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only" +IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only" RESTRICT="strip" # We cannot migrate between uclibc and uclibc-ng because as soon as portage @@ -49,7 +49,7 @@ alt_build_kprefix() { } just_headers() { - use crosscompile_opts_headers-only && is_crosscompile + use headers-only && is_crosscompile } uclibc_endian() { -- 2.15.1