summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2020-05-03 12:58:08 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2020-05-03 12:58:08 +0100
commit3148a994db4c470488d92fad5ed5b68ede7dc261 (patch)
treed3629ad8bde3ac12b6890d6ea0981f97ae270a7c /profiles
parentSupport a deps-only install of ci-server (diff)
downloadportage-3148a994db4c470488d92fad5ed5b68ede7dc261.tar.bz2
portage-3148a994db4c470488d92fad5ed5b68ede7dc261.tar.xz
portage-3148a994db4c470488d92fad5ed5b68ede7dc261.zip
Remove duplication in make.defaults
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/make.defaults4
-rw-r--r--profiles/base/server/make.defaults4
-rw-r--r--profiles/base/workstation/make.defaults4
3 files changed, 4 insertions, 8 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index e95f4ef..a36b4be 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,3 +1,7 @@
+ACCEPT_KEYWORDS="~amd64"
+CFLAGS="-O3 -march=native -pipe"
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="$LDFLAGS -O3 -march=native -pipe"
CCACHE_HARDLINK="true"
CCACHE_MAXSIZE="10G"
CLEAN_DELAY="0"
diff --git a/profiles/base/server/make.defaults b/profiles/base/server/make.defaults
index 840b3fc..284f104 100644
--- a/profiles/base/server/make.defaults
+++ b/profiles/base/server/make.defaults
@@ -1,7 +1,3 @@
-CFLAGS="-O3 -march=native -pipe"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="$LDFLAGS -O3 -march=native -pipe"
-ACCEPT_KEYWORDS="~amd64"
APACHE2_MODULES="-* alias auth_basic authn_core authz_core authz_host authz_user autoindex cache cache_disk cgid dav deflate dir env expires filter headers http2 log_config macro mime mime_magic proxy proxy_http remoteip rewrite socache_shmcb status unixd vhost_alias"
ALSA_PCM_PLUGINS="none"
USE="
diff --git a/profiles/base/workstation/make.defaults b/profiles/base/workstation/make.defaults
index a225594..39de949 100644
--- a/profiles/base/workstation/make.defaults
+++ b/profiles/base/workstation/make.defaults
@@ -1,8 +1,4 @@
-ACCEPT_KEYWORDS="~amd64"
APACHE2_MODULES="-* filter authz_host cgid mime_magic mime autoindex vhost_alias dav dir deflate log_config env rewrite cache mem_cache unixd socache authz_core authn_core socache_shmcb http2 alias"
-CFLAGS="-O3 -march=native -pipe -fno-stack-protector"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="$LDFLAGS -O3 -march=native -pipe"
RUBY_TARGETS="-* ruby25"
USE="
apng autoshutdown cddb -cdio -crypt cscope custom-cflags