From 1e1d0c8c8c90933534a5b4c6a4be394cbfd4bba0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 22 Jan 2017 13:02:56 +0100 Subject: [PATCH] profiles: Clean up obsolete flags from make.defaults --- profiles/arch/amd64-fbsd/make.defaults | 3 +-- profiles/arch/amd64/make.defaults | 3 +-- profiles/arch/hppa/make.defaults | 4 ++-- profiles/arch/x86/xbox/make.defaults | 3 +-- profiles/default/bsd/fbsd/make.defaults | 8 ++------ profiles/prefix/darwin/macos/arch/x64/make.defaults | 3 +-- profiles/prefix/darwin/macos/arch/x86/make.defaults | 3 +-- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults index 42329af60819..432f7743cf58 100644 --- a/profiles/arch/amd64-fbsd/make.defaults +++ b/profiles/arch/amd64-fbsd/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation. +# Copyright 1999-2017 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 # $Id$ # System-wide defaults for the G/FBSD Portage system @@ -20,7 +20,6 @@ ABI="amd64_fbsd" CFLAGS_x86_fbsd="-m32" LDFLAGS_x86_fbsd="-m elf_i386_fbsd -L/usr/lib32" -USE="mmx mmxext sse sse2" CPU_FLAGS_X86="mmx mmxext sse sse2" VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \ diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults index 96a6803f351a..df7976d89a1d 100644 --- a/profiles/arch/amd64/make.defaults +++ b/profiles/arch/amd64/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -36,7 +36,6 @@ CHOST_x32="x86_64-pc-linux-gnux32" # 2006/10/24 - Simon Stelling # They are masked, but we can enable them anyway for those who have # >=portage-2.1.2_pre3-r4 -USE="mmx mmxext sse sse2" CPU_FLAGS_X86="mmx mmxext sse sse2" # Michał Górny (03 Sep 2013) diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults index 188b0433c39d..add1edf68b50 100644 --- a/profiles/arch/hppa/make.defaults +++ b/profiles/arch/hppa/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ CXXFLAGS="${CFLAGS}" FEATURES="sandbox sfperms strict" -USE="cups foomaticdb fortran gdbm gpm imlib libwww spell xml2 firefox" +USE="cups foomaticdb fortran gdbm gpm imlib libwww spell firefox" # Michał Górny (01 Jul 2014) # Set ABI & DEFAULT_ABI consistently with ${ARCH}, to make ebuild diff --git a/profiles/arch/x86/xbox/make.defaults b/profiles/arch/x86/xbox/make.defaults index 79d000a05f9a..78d55164bb81 100644 --- a/profiles/arch/x86/xbox/make.defaults +++ b/profiles/arch/x86/xbox/make.defaults @@ -1,9 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ PROFILE_ARCH="xbox" -USE="mmx sse" CPU_FLAGS_X86="mmx sse" CFLAGS="-O2 -march=pentium3 -pipe" diff --git a/profiles/default/bsd/fbsd/make.defaults b/profiles/default/bsd/fbsd/make.defaults index 9456dca1c4bd..935820ed959a 100644 --- a/profiles/default/bsd/fbsd/make.defaults +++ b/profiles/default/bsd/fbsd/make.defaults @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation. +# Copyright 1999-2017 Gentoo Foundation. # Distributed under the terms of the GNU General Public License, v2 # $Id$ @@ -23,8 +23,4 @@ VIDEO_CARDS="dummy fbdev vmware" # Let virtual/mta pick ssmtp[mta] for stage1 builds. # https://bugs.gentoo.org/show_bug.cgi?id=408587 -# python2: let portage pulls in python-2 so that we get it as default -# interpreter in stage1's and add it to make.default so that it is rebuilt in -# stage 3 and when updating. -BOOTSTRAP_USE="${BOOTSTRAP_USE} mta python2" -USE="${USE} python2" +BOOTSTRAP_USE="${BOOTSTRAP_USE} mta" diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults index 51246a77f2e6..31eb7bf38250 100644 --- a/profiles/prefix/darwin/macos/arch/x64/make.defaults +++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults @@ -1,11 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ ARCH="x64-macos" ACCEPT_KEYWORDS="~x64-macos" -USE="mmx mmxext sse sse2" CPU_FLAGS_X86="mmx mmxext sse sse2" # multilib build stuff, single ABI (no multilib) diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults index 8a721e619da4..2132de8d3542 100644 --- a/profiles/prefix/darwin/macos/arch/x86/make.defaults +++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults @@ -1,11 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ ARCH="x86-macos" ACCEPT_KEYWORDS="~x86-macos" -USE="mmx mmxext sse sse2" CPU_FLAGS_X86="mmx mmxext sse sse2" # multilib build stuff, single ABI (no multilib) -- 2.26.2