| 1 |
commit: 8dd32dc8bd87b6a3a886f3bec1b3bb5f91002d2e |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 7 18:52:22 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 7 19:39:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd32dc8 |
| 7 |
|
| 8 |
profiles: drop CROSSCOMPILE_OPTS USE_EXPAND, bug #642712 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642712 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
profiles/base/make.defaults | 4 ++-- |
| 14 |
profiles/desc/crosscompile_opts.desc | 8 -------- |
| 15 |
profiles/embedded/make.defaults | 4 ++-- |
| 16 |
3 files changed, 4 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults |
| 19 |
index 95b8d6516ba..493af9ce75d 100644 |
| 20 |
--- a/profiles/base/make.defaults |
| 21 |
+++ b/profiles/base/make.defaults |
| 22 |
@@ -13,11 +13,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" |
| 23 |
|
| 24 |
# Env vars to expand into USE vars. Modifying this requires prior |
| 25 |
# discussion on gentoo-dev@l.g.o. |
| 26 |
-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 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" |
| 27 |
+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 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" |
| 28 |
|
| 29 |
# USE_EXPAND variables whose contents are not shown in package manager |
| 30 |
# output. Changes need discussion on gentoo-dev. |
| 31 |
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" |
| 32 |
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" |
| 33 |
|
| 34 |
CONFIG_PROTECT="/etc" |
| 35 |
CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" |
| 36 |
|
| 37 |
diff --git a/profiles/desc/crosscompile_opts.desc b/profiles/desc/crosscompile_opts.desc |
| 38 |
deleted file mode 100644 |
| 39 |
index 1923d8b13e8..00000000000 |
| 40 |
--- a/profiles/desc/crosscompile_opts.desc |
| 41 |
+++ /dev/null |
| 42 |
@@ -1,8 +0,0 @@ |
| 43 |
-# Copyright 1999-2017 Gentoo Foundation |
| 44 |
-# Distributed under the terms of the GNU General Public License v2 |
| 45 |
- |
| 46 |
-# This file contains descriptions of CROSSCOMPILE_OPTS USE_EXPAND flags. |
| 47 |
- |
| 48 |
-# Keep it sorted. |
| 49 |
- |
| 50 |
-headers-only - Build the toolchain against cross-headers only. |
| 51 |
|
| 52 |
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults |
| 53 |
index 911c7037f5d..793ae368917 100644 |
| 54 |
--- a/profiles/embedded/make.defaults |
| 55 |
+++ b/profiles/embedded/make.defaults |
| 56 |
@@ -27,11 +27,11 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" |
| 57 |
|
| 58 |
# Env vars to expand into USE vars. Modifying this requires prior |
| 59 |
# discussion on gentoo-dev@l.g.o. |
| 60 |
-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 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" |
| 61 |
+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 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" |
| 62 |
|
| 63 |
# USE_EXPAND variables whose contents are not shown in package manager |
| 64 |
# output. Changes need discussion on gentoo-dev. |
| 65 |
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" |
| 66 |
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_X86" |
| 67 |
|
| 68 |
# Variables that are set exclusively by the profile |
| 69 |
# and not by user configuration files. |
Archives