From 76db73945e12f8d23e0b6164b30a72232e75924c Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 14 Jun 2019 10:59:02 +0100 Subject: [PATCH] Correct subtle errors in make.conf --- states/portage/files/make.conf | 7 +++++-- states/portage/init.sls | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/states/portage/files/make.conf b/states/portage/files/make.conf index ae7a6ef..6b9e404 100644 --- a/states/portage/files/make.conf +++ b/states/portage/files/make.conf @@ -1,8 +1,11 @@ +{% if grains['host'] in useflags %} +{% set use = useflags[grains['host']] %} +{% endif %} # These settings were set by the catalyst build script that automatically # built this stage. # Please consult /usr/share/portage/config/make.conf.example for a more # detailed example. -CFLAGS="-O2 -pipe -march=haswell -fomit-frame-pointer" +CFLAGS="-O2 -pipe -march=native -fomit-frame-pointer" CXXFLAGS="${CFLAGS}" MAKEOPTS="-j{{ grains['num_cpus'] + 1 }}" @@ -17,7 +20,7 @@ LC_MESSAGES=C GENTOO_MIRRORS="ftp://ftp.mirrorservice.org/sites/distfiles.gentoo.org/" -USE="X alsa -pulseaudio pcsc-lite -bindist -cups -ldap libressl wayland unicode ipv6 ipv4" +USE="-pulseaudio -bindist -cups -ldap pcsc-lite X alsa libressl wayland unicode ipv6 ipv4 {{ use }}" GRUB_PLATFORMS="efi-64" VIDEO_CARDS="{{ video_cards }}" diff --git a/states/portage/init.sls b/states/portage/init.sls index 347770e..2bdc5a1 100644 --- a/states/portage/init.sls +++ b/states/portage/init.sls @@ -16,3 +16,5 @@ {% else %} video_cards: intel {% endif %} + useflags: + magnesium: consolekit pulseaudio bluetooth dbus -- 2.46.2