configs/imx6: updates for hardened armv7 plus etnaviv

Signed-off-by: Steve Arnold <nerdboy@gentoo.org>

11 files changed, 101 insertions, 135 deletions

diff --git a/configs/imx6/env/cabal-extra.conf b/configs/imx6/env/cabal-extra.conf
index 02f9f75..22a8a0e 100644
--- a/configs/imx6/env/cabal-extra.conf
+++ b/configs/imx6/env/cabal-extra.conf
@@ -1,2 +1,2 @@
-CABAL_EXTRA_CONFIGURE_FLAGS="--with-compiler=/usr/bin/armv7a-hardfloat-linux-gnueabi-gcc"
-#CABAL_EXTRA_CONFIGURE_FLAGS="--with-cc=armv7a-hardfloat-linux-gnueabi-gcc --with-compiler=/usr/bin/armv7a-hardfloat-linux-gnueabi-gcc"
+CABAL_EXTRA_CONFIGURE_FLAGS="--with-compiler=/usr/bin/x86_64-pc-linux-gnu-gcc"
+#CABAL_EXTRA_CONFIGURE_FLAGS="--with-cc=x86_64-pc-linux-gnu-gcc --with-compiler=/usr/bin/x86_64-pc-linux-gnu-gcc"
diff --git a/configs/imx6/env/clang-lt.conf b/configs/imx6/env/clang-lt.conf
index 128e752..275d15f 100644
--- a/configs/imx6/env/clang-lt.conf
+++ b/configs/imx6/env/clang-lt.conf
@@ -1,6 +1,6 @@
 CC=clang
 CXX=clang++
-CFLAGS="-march=native -O2 -pipe -flto=5 -fvectorize"
+CFLAGS="-march=athlon64 -O2 -pipe -flto=5 -fvectorize"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="${CFLAGS} -Wl,-plugin,/usr/lib64/LLVMgold.so"
 AR='/usr/local/bin/clang-ar'
diff --git a/configs/imx6/env/plain-flags.conf b/configs/imx6/env/plain-flags.conf
index 6cb313a..b8f25de 100644
--- a/configs/imx6/env/plain-flags.conf
+++ b/configs/imx6/env/plain-flags.conf
@@ -1,7 +1,6 @@
 CC="armv7a-hardfloat-linux-gnueabi-gcc"
 CXX="armv7a-hardfloat-linux-gnueabi-g++"
 LD="armv7a-hardfloat-linux-gnueabi-ld"
-CFLAGS="-march=armv7-a -mtune=cortex-a9 -O2 -pipe -mfpu=vfpv3-d16 -mfloat-abi=hard"
+CFLAGS="-march=armv7-a -mtune=cortex-a9 -mfpu=neon-fp16 -mfp16-format=ieee -mfloat-abi=hard -O2 -pipe"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-
diff --git a/configs/imx6/make.conf b/configs/imx6/make.conf
index 0395e94..c70352a 100644
--- a/configs/imx6/make.conf
+++ b/configs/imx6/make.conf
@@ -1,40 +1,36 @@
-# basic armv7 machine config for imx6 wandboard/udoo (armv7 neon vivante)
-
-USE="acl gudev udev -bindist avahi ipv6 alsa pulseaudio dbus gpm id3tag
-  dnotify fbcon ipv6 lcms emf sasl slp ssh ssl tls gnutls
-  consolekit policykit pkcs11 wheel caps xattr pam
-  nolvmstatic logrotate unicode lzma zip 7zip wxwidgets
-  gstreamer gphoto2 icq gps jabber curl browserplugin 
-  xcomposite xinerama corefonts g3dvl networking mjpeg glib svg nls
-  audiofile flac lame vorbis ogg libsamplerate inotify sqlite nsplugin
-  -guile fortran gcj go lua python ruby vala json
-  spell aspell sexy enchant imlib gd xrandr fam libcanberra libnotify
-  highlight introspection zeroconf abiword gstreamer gmp wifi v4l xdg
-  freetype freetype2 truetype type1-fonts truetype-fonts bitmap-fonts
-  bluetooth system-cairo system-jpeg system-sqlite webkit threads upower
-  gnome-keyring libsecret telepathy zeitgeist opus oss taglib theora vpx
-
-  nptl pic dri drm -opengl egl gles gles2 neon -openvg imx
-  xorg X gtk3 gtk -wicd -nautilus -directfb gdbm berkdb
-  wayland weston gbm vdpau opencl eglfs evdev ibus kms lto
-
-  system-libvpx system-icu -bindist -gtkspell tslib phonon qml libav
-  -perl qt -qt3 -qt4 qt3support qt5 -kde -kde3 -kde4 -gnome -systemd
-  -svga -apm -emacs -directfb -smartcard -nss -openct -clamav
-  modemmanager networkmanager -xinerama gnome-online-accounts
+# basic armv7 machine config for imx6 wandboard/udoo (armv7 neon etnaviv)
+
+USE="acl apache2 -cups ipv6 logrotate sasl snmp udev
+     gd gmp gs graphviz jpeg jbig png tiff unicode nls xpm
+     spell bzip2 gpm imlib usb expat innodb pax hardened
+     curl postgres jpeg2k dejavu tcpd fam sqlite dbus svg git
+     subversion ccache fontconfig gudev hwdb distcc lzma
+     samba -avahi gdbm consolekit policykit xattr alsa caps
+
+     -gcj fortran -go lua java -perl python howl -ruby vala
+     gnome-keyring gnutls glib wheel premount introspection
+
+     nptl nptlonly threads pic dri drm neon imx armada etnaviv
+     wayland weston gbm vdpau openc eglfs evdev ibus kms lto
+
+     system-libvpx system-icu -bindist -gtkspell -tslib -phonon qml libav
+     egl gles1 gles2 opengl glx dri3
+
+     X xorg gtk -qt -qt3 -qt4 -qt3support qt5 -kde -kde3 -kde4 -gnome
+     -svga -apm -emacs -directfb -smartcard -nss -openct -clamav -systemd
+     -modemmanager -networkmanager -xinerama -bonobo -gnome-online-accounts
+     -php -hardenedphp
 "
 
 # flto=jobserver might be too much
-LINK_OPTS="-flto=4 -ftree-vectorize"
-# switch from neon to vfp for trimslice
-#FPU_OPTS="-mfpu=vfpv3-d16-fp16 -mfp16-format=ieee -mfloat-abi=hard"
+LINK_OPTS="-flto=4"
 FPU_OPTS="-mfpu=neon-fp16 -mfp16-format=ieee -mfloat-abi=hard"
-VEC_OPTS="-ftree-loop-distribution -fvect-cost-model=cheap"
+VEC_OPTS="-ftree-vectorize -ftree-loop-distribution -fvect-cost-model=cheap"
 TUNE_OPTS="-march=armv7-a -mtune=cortex-a9"
 
 #CFLAGS="-march=armv7-a -mtune=cortex-a9 -mfpu=neon-fp16 -mfp16-format=ieee -mfloat-abi=hard -O2 -pipe"
 CFLAGS="${TUNE_OPTS} ${FPU_OPTS} -O2 -pipe ${VEC_OPTS} ${LINK_OPTS}"
-CXXFLAGS="${CFLAGS} -fvisibility=hidden"
+CXXFLAGS="${CFLAGS}"
 LDFLAGS="${CFLAGS} -fuse-linker-plugin"
 
 # WARNING: Changing your CHOST is not something that should be done lightly.
@@ -48,10 +44,7 @@ PKGDIR="${PORTDIR}/packages"
 ACCEPT_KEYWORDS="~arm"
 
 ##SYNC="rsync://rsync.gentoo.org/gentoo-portage"
-#GENTOO_MIRRORS="http://gentoo.osuosl.org/"
-
-##SYNC="rsync://prime.arnolds.bogus/gentoo-portage"
-GENTOO_MIRRORS="http://wimpy.arnolds.bogus/gentoo/"
+GENTOO_MIRRORS="http://gentoo.osuosl.org/"
 
 ACCEPT_LICENSE="@GPL-COMPATIBLE @OSI-APPROVED @EULA dlj-1.1 skype-eula googleearth AdobeFlash-10.1 Oracle-BCLA-JavaSE"
 
@@ -68,16 +61,16 @@ PORTAGE_TMPFS="/dev/shm"
 
 MAKEOPTS="-j5"
 
-PYTHON_TARGETS="python2_7 python3_4"
-RUBY_TARGETS="ruby23 ruby22 ruby21"
+RUBY_TARGETS="ruby24 ruby23 ruby22 ruby21"
 
-FEATURES="nodoc -distcc sandbox buildpkg ccache -splitdebug userpriv usersandbox"
+FEATURES="nodoc distcc sandbox -buildpkg ccache -splitdebug userpriv usersandbox"
 
 ALSA_CARDS="soc_imx_sgtl5000 usb-audio"
-CURL_SSL="openssl"
 INPUT_DEVICES="keyboard mouse evdev"
-VIDEO_CARDS="fbdev"
+VIDEO_CARDS="imx vivante"
+
 LINGUAS="en_US en"
+CURL_SSL="openssl"
 
 APACHE2_MODULES="actions alias auth_digest auth_basic authn_alias
   authn_anon authn_dbm authn_default authn_file authz_dbm authz_default
@@ -88,7 +81,7 @@ APACHE2_MODULES="actions alias auth_digest auth_basic authn_alias
   unique_id userdir usertrack vhost_alias"
 
 
-CCACHE_SIZE="1G"
+CCACHE_SIZE="2G"
 
 # Set PORTDIR for backward compatibility with various tools:
 #   gentoo-bashcomp - bug #478444
diff --git a/configs/imx6/package.accept_keywords b/configs/imx6/package.accept_keywords
index e68754f..87a5ad1 100644
--- a/configs/imx6/package.accept_keywords
+++ b/configs/imx6/package.accept_keywords
@@ -1,12 +1,14 @@
 #>=sys-devel/binutils-9999 **
 
->=dev-scheme/guile-2.0 **
+>=sys-firmware/b43-firmware-6.30.163.46 **
+>=net-wireless/b43-fwcutter-019 **
+>=sys-firmware/bluez-firmware-1.2 **
+>=dev-python/pybluez-0.18-r1 **
 
 >=x11-libs/cairo-9999 **
->=x11-proto/fontsproto-9999 **
->=x11-proto/randrproto-9999 **
->=x11-proto/xproto-9999 **
 
+>=sys-power/cpudyn-1.0.1 **
+>=sys-apps/usbmon-6-r1 **
 >=app-text/pastebinit-1.4.1 **
 >=dev-python/configobj-5.0.6 **
 
diff --git a/configs/imx6/package.env b/configs/imx6/package.env
index a88866d..d7e4062 100644
--- a/configs/imx6/package.env
+++ b/configs/imx6/package.env
@@ -1,19 +1,22 @@
 # something bombs here...
 # no-graphite.conf on x86
 ## no-vector.conf on arm
-sys-devel/gcc no-bigj.conf plain-flags.conf
-sys-devel/binutils gold.conf plain-flags.conf
+sys-devel/binutils gold.conf
 sys-libs/glibc plain-flags.conf
-sys-devel/llvm plain-flags.conf no-bigj.conf
+sys-devel/llvm plain-flags.conf
+dev-lang/gnat-gcc plain-flags.conf
+dev-libs/gmp no-lto.conf
 dev-lang/ocaml no-lto.conf
-dev-scheme/guile plain-flags.conf
 dev-lang/perl plain-flags.conf
 
 dev-libs/boost no-lto.conf no-vector.conf
 dev-util/boost-build no-lto.conf no-vector.conf
 dev-util/cmake no-lto.conf no-vector.conf
 app-editors/atom clang.conf
-sys-libs/libcap plain-flags.conf
+
+dev-lang/spidermonkey no-lto.conf
+dev-util/ragel plain-flags.conf
+dev-util/colm plain-flags.conf
 sys-power/nvclock no-lto.conf
 app-shells/bash no-lto.conf no-vector.conf
 
@@ -21,20 +24,14 @@ dev-lang/python-exec no-lto.conf no-vector.conf
 sys-apps/portage no-lto.conf no-vector.conf
 dev-lang/python no-lto.conf no-vector.conf
 dev-python/notify-python no-lto.conf
-dev-util/source-highlight lto-default.conf
-
-dev-lang/spidermonkey no-lto.conf
-dev-lang/ruby no-lto.conf no-vector.conf
+dev-lang/ruby plain-flags.conf
 dev-vcs/cvs no-lto.conf
 dev-python/numpy no-lto.conf
-dev-libs/openssl plain-flags.conf
 
-x11-libs/gtk+:3 med-j.conf
-dev-qt/qtwebkit no-lto.conf med-j.conf
-net-libs/webkit-gtk no-lto-default.conf med-j.conf
-www-client/chromium no-lto.conf med-j.conf
-media-libs/libvpx no-lto.conf
-www-client/firefox lto-spec.conf med-j.conf
+dev-qt/qtwebkit no-lto.conf
+net-libs/webkit-gtk no-lto.conf
+www-client/chromium no-lto.conf
+www-client/firefox no-lto.conf
 app-text/texlive-core no-lto.conf
 
 sys-apps/kmod no-lto.conf
@@ -50,23 +47,17 @@ dev-libs/dee no-lto.conf
 sys-devel/gettext no-lto.conf
 msys-libs/ncurses no-lto.conf
 app-text/tesseract no-lto.conf
-app-text/poppler lto-default.conf
 app-accessibility/brltty no-lto.conf
 
-media-libs/harfbuzz plain-flags.conf
-media-libs/gstreamer lto-spec.conf med-j.conf
 media-libs/x264 no-lto.conf
 media-libs/alsa-lib no-lto.conf
 media-sound/pulseaudio no-lto.conf
 media-libs/flac no-lto.conf
 media-video/vlc no-lto.conf
-media-libs/libwebp plain-flags.conf
-
 media-video/libav no-lto.conf
 media-libs/libpostproc no-lto.conf
 dev-libs/weston no-lto.conf
-app-office/libreoffice no-lto.conf med-j.conf
-dev-libs/libassuan plain-flags.conf
+app-office/libreoffice no-lto.conf
 
 dev-qt/qtscript no-lto.conf
 media-gfx/graphviz no-lto.conf
@@ -88,9 +79,6 @@ sci-mathematics/minisat no-lto.conf
 dev-util/cbmc no-lto.conf
 dev-util/cccc no-lto.conf
 
-dev-cpp/glibmm lto-default.conf
-app-text/qpdf lto-default.conf
-net-print/cups lto-default.conf
 dev-lang/ghc cabal-extra.conf plain-flags.conf
 dev-haskell/network plain-flags.conf
 #dev-haskell/convertible cabal-extra.conf
diff --git a/configs/imx6/package.keywords b/configs/imx6/package.keywords
index a4157fb..45cc878 100644
--- a/configs/imx6/package.keywords
+++ b/configs/imx6/package.keywords
@@ -1 +1,5 @@
 =sys-boot/vboot-utils-1.0_p20130222 **
+
+>=dev-libs/gom-0.3.1
+#>=media-libs/grilo-0.3.1
+>=media-plugins/grilo-plugins-0.3.1
diff --git a/configs/imx6/package.mask b/configs/imx6/package.mask
index 6d43585..06ee703 100644
--- a/configs/imx6/package.mask
+++ b/configs/imx6/package.mask
@@ -1,33 +1,24 @@
-#>=sys-block/zram-init-3.0
+>=sys-block/zram-init-3.0
 
-# stupid perl fail on arm
-#=dev-lang/perl-5.22.1
-#=virtual/perl-Module-CoreList-5.201.512.130
-#=virtual/perl-Storable-2.530.100
-
->=media-sound/exaile-9999
+#>=media-sound/exaile-9999
 #>=www-client/firefox-24.0
 
+>=app-i18n/ibus-1.5.15
 =sys-devel/libtool-2.4.3
->=sys-fs/udev-220
->=virtual/udev-220
->=virtual/libgudev-220
->=virtual/libudev-220
->=sys-fs/eudev-1.3
+#>=sys-fs/udev-220
+#>=virtual/udev-220
+#>=virtual/libgudev-220
+#>=virtual/libudev-220
+#>=sys-fs/eudev-1.3
 
-#>=media-libs/mesa-9999
+>=media-libs/mesa-9999
 >=sys-devel/llvm-9999
 >=x11-libs/cairo-9999
-#>=x11-base/xorg-drivers-9999
-#>=x11-base/xorg-server-9999
-#>=x11-libs/libdrm-9999
-#>=x11-drivers/xf86-video-armsoc-9999
-
-#>=dev-util/boost-1.58.0
-#>=dev-util/boost-build-1.58.0
+>=x11-base/xorg-drivers-9999
+>=x11-base/xorg-server-9999
+>=x11-libs/libdrm-9999
 
-=sys-libs/glibc-2.18*
->=sys-libs/glibc-2.23
+#>=sys-libs/glibc-2.22
 #>=sys-kernel/linux-headers-3.11
 #>=sci-libs/proj-4.8.0
 
diff --git a/configs/imx6/package.unmask b/configs/imx6/package.unmask
index f497a69..bf0d794 100644
--- a/configs/imx6/package.unmask
+++ b/configs/imx6/package.unmask
@@ -1,20 +1,14 @@
-#>=net-libs/webkit-gtk-2.4.1
-#>=net-libs/webkit-gtk-2.4.1-r200
-#>=sys-devel/binutils-9999
-
->=dev-scheme/guile-2.0
-
->=x11-misc/sddm-9999:0
->=x11-libs/libXfont-9999
->=x11-proto/fontsproto-9999
+#>=x11-misc/sddm-9999:0
+#>=x11-libs/libXfont-9999
+#>=x11-proto/fontsproto-9999
 >=dev-libs/wayland-1.5.0
 >=dev-libs/weston-1.5.0
 
->=x11-base/xorg-server-9999
->=x11-libs/cairo-9999
->=x11-libs/libdrm-9999
->=x11-base/xorg-drivers-9999
->=media-libs/mesa-9999
+#>=x11-base/xorg-server-9999
+#>=x11-libs/cairo-9999
+#>=x11-libs/libdrm-9999
+#>=x11-base/xorg-drivers-9999
+#>=media-libs/mesa-9999
 
 #=www-client/chromium-45.0.2454.6
 
diff --git a/configs/imx6/package.use b/configs/imx6/package.use
index e878619..159637f 100644
--- a/configs/imx6/package.use
+++ b/configs/imx6/package.use
@@ -1,15 +1,22 @@
-sys-devel/autogen guile
+app-crypt/pinentry -gtk
+dev-vcs/git -gpg
+dev-util/cmake -qt5
+
+net-misc/ntp -samba -snmp
 app-pda/gtkpod -aac -cdr clutter
 www-client/epiphany jit -nss
 net-misc/openvpn iproute2 passwordsave pkcs11
 net-misc/ethercard-diag diag-only
 x11-drivers/xf86-video-fbturbo -gles2
+
 app-misc/mc samba sftp
-net-fs/nfs-utils nfsv41
+net-fs/nfs-utils nfsv4 -nfsv41 -tcpd
 x11-themes/gentoo-artwork kde
 x11-misc/lightdm gtk qt4
 www-client/chromium -proprietary-codecs
 dev-libs/libdbusmenu -gtk
+gnome-base/librsvg vala introspection -tools
+app-crypt/gcr gtk vala introspection
 
 dev-qt/qtcore:5 icu
 dev-qt/qtdeclarative localstorage
@@ -41,9 +48,9 @@ net-im/qutim histman irc jabber jingle oscar plugman purple qml telepathy tools
 media-sound/clementine googledrive lastfm
 media-sound/cantata  dynamic musicbrainz online-services replaygain streams taglib
 
-dev-vcs/subversion -dso perl
+dev-vcs/subversion -dso perl -gnome-keyring
 dev-lang/perl -ithreads
-dev-vcs/qct cvs subversion
+dev-vcs/git cvs subversion perl
 sys-apps/man gdbm -berkdb
 net-dns/avahi gdbm
 app-crypt/gcr gtk
@@ -59,6 +66,7 @@ xfce-base/xfce4-settings  libcanberra libinput
 media-libs/netpbm jbig rle
 x11-misc/xdg-user-dirs gtk
 x11-misc/xscreensaver opengl
+11-libs/libxkbcommon X
 xfce-extra/xfce4-soundmenu-plugin lastfm
 
 # needed by qt-webkit?
@@ -73,7 +81,7 @@ www-client/midori granite jit webkit2 -deprecated -introspection zeitgeist
 media-libs/cogl opengl gles2
 x11-libs/cairo -drm -lto gles2 -opengl xcb xlib-xcb
 
-sys-devel/llvm -ncurses clang
+sys-devel/llvm -ncurses
 dev-libs/weston colord editor examples fbdev gles2 -opengl rdp -resize-optimization view wayland-compositor xwayland
 gnome-extra/zeitgeist downloads-monitor extensions -fts icu -plugins telepathy
 net-im/telepathy-mission-control -upower
@@ -86,7 +94,7 @@ sys-apps/kmod lzma
 sys-libs/ncurses tinfo
 net-dns/avahi mdnsresponder-compat
 dev-libs/boost icu
-media-libs/harfbuzz icu
+media-libs/harfbuzz icu -graphite
 
 app-misc/mc -slang sftp
 dev-libs/DirectFB fbcon imlib2 jpeg2k drmkms -egl input_hub mpeg2 mpeg3 multicore
@@ -96,11 +104,13 @@ net-libs/glib-networking  -libproxy
 
 media-libs/libcanberra sound
 sys-fs/lvm2 -static static-libs -thin
+>=sys-fs/eudev-3.2.1-r1 static-libs
 >=virtual/libudev-215-r1 static-libs
 >=sys-fs/udev-208-r1 static-libs
 
 gnome-base/gvfs archive cdda fuse gtk gnome-keyring http nfs samba udisks zeroconf
 dev-libs/boost icu
+sys-devel/make guile
 sys-auth/pambase gnome-keyring mktemp pam_ssh
 app-text/ghostscript-gpl cups
 sys-apps/util-linux tty-helpers
@@ -120,7 +130,7 @@ net-irc/hexchat -gtkspell libcanberra perl plugin-checksum plugin-doat plugin-fi
 net-fs/samba -winbind
 net-fs/cifs-utils -acl -ads creds
 media-libs/gst-plugins-base theora
-media-libs/gst-plugins-bad -gles2 opengl
+media-libs/gst-plugins-bad -gles2
 
 media-video/vlc cddb egl fontconfig -opengl live matroska neon omxil alsa rtsp taglib theora wma-fixed
 
@@ -133,8 +143,8 @@ x11-apps/xinit -minimal
 x11-libs/libdrm libkms -kernel-src
 =media-libs/mesa-10* -dri3 -llvm -pic -gallium
 # don't use dri3 interface for mali?
->=media-libs/mesa-9999 -dri3
-media-libs/mesa classic gallium egl gles1 gles2 llvm nptl osmesa xa xvmc -bindist
+>=media-libs/mesa-9999 dri3 -llvm
+media-libs/mesa dri3 gallium egl gles1 gles2 -llvm nptl osmesa xa xvmc -bindist -classic
 x11-apps/mesa-progs egl gles1 gles2
 
 www-client/firefox -minimal -system-libvpx
@@ -156,7 +166,7 @@ media-libs/harfbuzz icu
 media-video/mplayer2 -dvd -dvdnav yuv4mpeg
 media-video/mplayer live lzo rtc -dvd -dvdnav -encode libmpeg2 -opengl -osdmenu -xscreensaver -xv -X
 media-video/ffmpeg armv7 armvfp -encode -opengl -X
-media-video/libav vdpau vpx armv7 armvfp encode gpl gsm jack jpeg2k speex -opengl opus X tools theora webp
+media-video/libav -vdpau vpx armv7 armvfp encode gpl gsm jack jpeg2k speex -opengl opus X tools theora
 # needs neon/asm patches
 virtual/ffmpeg gsm jpeg2k opus speex theora
 
diff --git a/configs/imx6/profile/package.use.mask b/configs/imx6/profile/package.use.mask
deleted file mode 100644
index 4f52bc6..0000000
--- a/configs/imx6/profile/package.use.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-media-libs/cogl -gstreamer
-media-libs/clutter -egl
-x11-libs/cairo -gles2
-dev-libs/weston -gles2 -rpi
-
-media-video/libav -vdpau -vpx -x264 pic
-media-video/ffmpeg -vdpau -vpx -x264 pic
-virtual/ffmpeg -vdpau -vpx -x264 pic
-media-libs/libvpx pic
-media-libs/mesa pic
-
-lxqt-base/lxqt-meta -lximage
-
-www-client/chromium pic
-