commit: 23b2348491f0f875f0b7d057f46fc8a06a24e021
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 20:16:16 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 19:23:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b23484
profiles: Add CPU_FLAGS_ARM to USE_EXPAND
Add it as hidden USE_EXPAND in top-level profiles, and unhide in
specific arch profiles.
profiles/arch/arm/make.defaults | 4 ++++
profiles/arch/arm64/make.defaults | 4 ++++
profiles/base/make.defaults | 4 ++--
profiles/default/linux/uclibc/arm/make.defaults | 4 ++++
profiles/embedded/make.defaults | 4 ++--
profiles/hardened/linux/musl/arm/make.defaults | 4 ++++
profiles/hardened/linux/musl/arm64/make.defaults | 4 ++++
7 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 0009e44a755..48822043d21 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -18,3 +18,7 @@ CHOST_arm="${CHOST}"
# 2006/08/18 - Donnie Berkholz <dberkh...@gentoo.org>
# Defaults for video drivers
VIDEO_CARDS="exynos fbdev omap"
+
+# Michał Górny <mgo...@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/arch/arm64/make.defaults
b/profiles/arch/arm64/make.defaults
index 20318a45380..5dff71b1482 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -16,3 +16,7 @@ LIBDIR_arm64="lib64"
# Defaults for video drivers
VIDEO_CARDS="fbdev"
+
+# Michał Górny <mgo...@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 284ada2b945..c177850ab54 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-...@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_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
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 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
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_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS 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/default/linux/uclibc/arm/make.defaults
b/profiles/default/linux/uclibc/arm/make.defaults
index 94651d9d80f..a551dc5118c 100644
--- a/profiles/default/linux/uclibc/arm/make.defaults
+++ b/profiles/default/linux/uclibc/arm/make.defaults
@@ -17,3 +17,7 @@ DEFAULT_ABI="arm"
MULTILIB_ABIS="arm"
CHOST_arm="${CHOST}"
LIBDIR_arm="lib"
+
+# Michał Górny <mgo...@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 9ecb7fb8731..120bf5438ea 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-...@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_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 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 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 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_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS 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/hardened/linux/musl/arm/make.defaults
b/profiles/hardened/linux/musl/arm/make.defaults
index 2d8979e47dc..e0e4051efde 100644
--- a/profiles/hardened/linux/musl/arm/make.defaults
+++ b/profiles/hardened/linux/musl/arm/make.defaults
@@ -17,3 +17,7 @@ DEFAULT_ABI="arm"
MULTILIB_ABIS="arm"
CHOST_arm="${CHOST}"
LIBDIR_arm="lib"
+
+# Michał Górny <mgo...@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
diff --git a/profiles/hardened/linux/musl/arm64/make.defaults
b/profiles/hardened/linux/musl/arm64/make.defaults
index 886f0423dcc..d9ba618fa18 100644
--- a/profiles/hardened/linux/musl/arm64/make.defaults
+++ b/profiles/hardened/linux/musl/arm64/make.defaults
@@ -17,3 +17,7 @@ DEFAULT_ABI="arm64"
MULTILIB_ABIS="arm64"
CHOST_arm64="${CHOST}"
LIBDIR_arm64="lib"
+
+# Michał Górny <mgo...@gentoo.org> (14 Mar 2017)
+# Unhide the ARM-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
