Commit: 5095bc2ebafc453774d521ed1eee2f08c38bd51d
Parent: 7b259e38f5580a7664bebdb3e5cdee71cf1ac3ce
Author: Randy Palamar
Date: Tue, 31 Dec 2024 21:27:08 -0700
portage: bump config
mostly changes related to building on arm64 but nothing that
matters enough to be committed to a separate branch.
Some stuff is relevant though such as removing the defunct musl
portage overlay and adding some missing portage/env files
Diffstat:
15 files changed, 81 insertions(+), 80 deletions(-)
diff --git a/.config/sys/etc/portage/env/gcc b/.config/sys/etc/portage/env/gcc
@@ -0,0 +1,7 @@
+CC="gcc"
+CXX="g++"
+CPP="gcc -E"
+AR="ar"
+NM="nm"
+RANLIB="ranlib"
+READELF="readelf"
diff --git a/.config/sys/etc/portage/env/installsources b/.config/sys/etc/portage/env/installsources
@@ -0,0 +1,2 @@
+FEATURES="${FEATURES} installsources"
+
diff --git a/.config/sys/etc/portage/env/pic b/.config/sys/etc/portage/env/pic
@@ -0,0 +1 @@
+CFLAGS="${CFLAGS} -fPIC"
diff --git a/.config/sys/etc/portage/env/readelf b/.config/sys/etc/portage/env/readelf
@@ -0,0 +1 @@
+READELF="readelf"
diff --git a/.config/sys/etc/portage/make.conf b/.config/sys/etc/portage/make.conf
@@ -3,10 +3,11 @@ CFLAGS="${COMMON_FLAGS}"
CXXFLAGS="${COMMON_FLAGS}"
FCFLAGS="${COMMON_FLAGS}"
FFLAGS="${COMMON_FLAGS}"
+RUSTFLAGS="-C target-cpu=native"
LDFLAGS="-fuse-ld=mold ${LDFLAGS}"
LD="mold"
-EMERGE_DEFAULT_OPTS="--ask --verbose --jobs=8 --load-average 8.00"
+EMERGE_DEFAULT_OPTS="--ask --verbose --jobs=8 --load-average 9.00"
MAKEOPTS="-j10 -l10"
PORTAGE_COMPRESS=""
@@ -18,16 +19,16 @@ LC_MESSAGES=C
USE="alsa clang cjk ffmpeg opengl savedconfig \
minimal udev vaapi vulkan X xinerama xft wayland zstd \
- bluetooth pipewire pulseaudio \
+ bluetooth dbus pipewire pulseaudio \
fontconfig truetype \
flac ogg opus vorbis \
gif jpeg png vpx webp -jpeg2k -svg \
-acl -accessibility -bzip2 -cups -deprecated \
-cxx -fortran -openmp \
-initramfs \
- -gdbm -gnome -gnome-keyring -gnutls -idn -ldap \
+ -gdbm -gnome -gnome-keyring -gnutls -idn -introspection -ldap \
-ncurses -nls -pam -pcre -readline -smartcard \
- dbus -gtk3 -udisks -systemd"
+ -gtk3 -udisks -systemd"
MICROCODE_SIGNATURES="-S"
LLVM_TARGETS="AMDGPU AVR ARM SPIRV X86"
@@ -40,8 +41,9 @@ VIDEO_CARDS="amdgpu radeonsi"
CPU_FLAGS_X86="aes avx avx2 avx512f avx512dq avx512cd avx512bw avx512vl \
avx512vbmi f16c fma3 mmx mmxext pclmul popcnt rdrand sha \
sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3"
+CPU_FLAGS_ARM="edsp neon thumb vfp vfpv3 vfpv4 vfp-d32 aes sha1 sha2 \
+ crc32 sm4 asimddp i8mm v4 v5 v6 v7 v8 thumb2"
-CONFIG_PROTECT="${CONFIG_PROTECT} /usr/bin/startx"
-UNINSTALL_IGNORE="/etc/portage"
+UNINSTALL_IGNORE="/etc/portage /sbin /bin /usr/sbin"
LOCAL_PREFIX="/usr/l"
diff --git a/.config/sys/etc/portage/package.accept_keywords/set b/.config/sys/etc/portage/package.accept_keywords/set
@@ -6,47 +6,57 @@ x11-misc/dmenu **
x11-terms/st-terminfo **
# what the h**k is the point of stable/unstable fonts
-media-fonts/* ~amd64
+media-fonts/* ~amd64 ~arm64
# Haskell
-app-text/pandoc ~amd64
-app-text/pandoc-cli ~amd64
-virtual/pandoc ~amd64
-dev-haskell/* ~amd64
-dev-lang/ghc ~amd64
-dev-util/hindent ~amd64
-dev-util/shake ~amd64
-dev-util/shellcheck ~amd64
+app-text/pandoc ~amd64 ~arm64
+app-text/pandoc-cli ~amd64 ~arm64
+virtual/pandoc ~amd64 ~arm64
+dev-haskell/* ~amd64 ~arm64
+dev-lang/ghc ~amd64 ~arm64
+dev-util/hindent ~amd64 ~arm64
+dev-util/shake ~amd64 ~arm64
+dev-util/shellcheck ~amd64 ~arm64
# Personally Unmasked
-app-misc/abduco ~amd64
-games-emulation/higan ~amd64
-media-gfx/farbfeld ~amd64
-media-libs/libplacebo ~amd64
-media-sound/ncmpcpp ~amd64
-media-video/mpv ~amd64
-sys-process/nvtop ~amd64
+app-misc/abduco ~amd64 ~arm64
+games-emulation/higan ~amd64 ~arm64
+media-gfx/farbfeld ~amd64 ~arm64
+media-libs/libplacebo ~amd64 ~arm64
+media-sound/ncmpcpp ~amd64 ~arm64
+media-video/mpv ~amd64 ~arm64
+sys-process/nvtop ~amd64 ~arm64
-~media-libs/glfw-3.4 ~amd64
+~media-libs/glfw-3.4 ~amd64 ~arm64
# No stable version
-~x11-misc/xidle-26052015 ~amd64
+~x11-misc/xidle-26052015 ~amd64 ~arm64
-media-gfx/renderdoc ~amd64
-media-video/obs-studio ~amd64
+media-gfx/renderdoc ~amd64 ~arm64
+media-video/obs-studio ~amd64 ~arm64
-www-client/firefox ~amd64
-~dev-libs/nss-3.107 ~amd64
+www-client/firefox ~amd64 ~arm64
+~dev-libs/nss-3.107 ~amd64 ~arm64
-app-text/tesseract ~amd64
+app-text/tesseract ~amd64 ~arm64
# unfucky mpv
-~dev-lang/luajit-2.1.0_beta3_p20220613 ~amd64
+~dev-lang/luajit-2.1.0_beta3_p20220613 ~amd64 ~arm64
-sys-kernel/linux-headers ~amd64
-sys-kernel/gentoo-sources ~amd64
+sys-kernel/linux-headers ~amd64 ~arm64
+sys-kernel/gentoo-sources ~amd64 ~arm64
# needed for portage installsources (who knows why it needs any extra packages)
-sys-libs/error-standalone ~amd64
-~sys-devel/dwz-0.15 ~amd64
-~dev-util/debugedit-5.1 ~amd64
+sys-libs/error-standalone ~amd64 ~arm64
+~sys-devel/dwz-0.15 ~amd64 ~arm64
+~dev-util/debugedit-5.1 ~amd64 ~arm64
+
+# arm64 only
+sys-kernel/git-sources ~arm64
+~app-benchmarks/hyperfine-1.18.0 ~arm64
+~app-i18n/anthy-9100h ~arm64
+~dev-libs/mimalloc-2.1.7 ~arm64
+~dev-libs/miniz-3.0.2 ~arm64
+~media-gfx/inkscape-1.4 ~arm64
+~media-libs/x265-3.6 ~arm64
+~sys-devel/mold-2.35.1 ~arm64
diff --git a/.config/sys/etc/portage/package.env/set b/.config/sys/etc/portage/package.env/set
@@ -7,6 +7,8 @@ sys-apps/coreutils nobloat
dev-lang/ghc nomold
+sys-libs/error-standalone pic
+
sys-libs/musl debug installsources
# misuses the linker
@@ -15,8 +17,5 @@ gui-libs/gtk nomold
# possibly broken configure script
#sys-firmware/seabios gcc useld
-# NOTE: gcc is garbage software that needs to build itself otherwise it will fail to bootstrap
-sys-devel/gcc gcc
-
-# NOTE: calls readelf directly with incorrect arguments
-sys-devel/dwz gcc
+# NOTE: incorrectly calls readelf to find the size of the platform's pointer
+sys-devel/dwz readelf
diff --git a/.config/sys/etc/portage/package.use/app b/.config/sys/etc/portage/package.use/app
@@ -1,3 +1,4 @@
+app-accessibility/at-spi2-core introspection
app-alternatives/gzip pigz -reference
app-alternatives/ninja samurai -reference
app-alternatives/sh dash -bash
@@ -10,7 +11,7 @@ app-crypt/mit-krb5 -keyutils -pkinit
app-dicts/myspell-en l10n_en
app-editors/vim -crypt -X # for running vis tests
app-emulation/qemu io-uring static-user -curl -doc -gtk -oss -pin-upstream-blobs -slirp -usb -vnc
-app-i18n/ibus gtk3
+app-i18n/ibus gtk3 introspection
app-i18n/kakasi l10n_ja
app-shells/bash -net
app-shells/dash static
diff --git a/.config/sys/etc/portage/package.use/dev b/.config/sys/etc/portage/package.use/dev
@@ -3,11 +3,11 @@ dev-debug/gdb -server
dev-lang/ghc ghcbootstrap -doc
dev-lang/lua static
dev-lang/luajit lua52compat
-dev-lang/python ncurses readline sqlite
-dev-lang/rust system-bootstrap system-llvm -llvm_targets_SPIRV
+dev-lang/python ncurses readline sqlite -ensurepip
+dev-lang/rust system-bootstrap system-llvm -llvm_targets_*
dev-libs/boost nls
dev-libs/elfutils -utils
-dev-libs/glib dbus static-libs
+dev-libs/glib dbus introspection static-libs
dev-libs/gmp pic static-libs
dev-libs/json-c static-libs # cryptsetup
dev-libs/libpcre2 jit static-libs
@@ -16,9 +16,10 @@ dev-libs/nss -nss-pem
dev-libs/openssl static-libs # cryptsetup
dev-libs/popt static-libs # cryptsetup
dev-lua/ldoc lua_single_target_luajit
-dev-python/matplotlib latex
+dev-python/matplotlib latex gtk3
dev-python/numpy -lapack
dev-python/pillow tiff
+dev-python/pyqt5 widgets gui
dev-qt/qtgui dbus egl ibus
dev-qt/qtwebchannel qml
-dev-vcs/git -iconv -python -pcre -webdav
+dev-vcs/git -iconv -pcre -webdav
diff --git a/.config/sys/etc/portage/package.use/media b/.config/sys/etc/portage/package.use/media
@@ -5,7 +5,7 @@ media-gfx/inkscape postscript
media-gfx/renderdoc qt5
media-libs/freetype harfbuzz
media-libs/gegl cairo -ffmpeg
-media-libs/harfbuzz icu # needed for Tex
+media-libs/harfbuzz icu introspection # needed for Tex
media-libs/imlib2 -tiff
media-libs/jbig2dec -png
media-libs/leptonica tiff # for tesseract tiff support
diff --git a/.config/sys/etc/portage/package.use/net b/.config/sys/etc/portage/package.use/net
@@ -1,8 +1,11 @@
net-dns/unbound threads
+net-libs/libsoup -vala
net-libs/mbedtls threads
net-libs/ngtcp2 gnutls
net-libs/nodejs icu system-icu -npm
net-misc/curl ssh
+net-misc/modemmanager -mbim
+net-misc/networkmanager -gtk-doc -ppp -wext
net-misc/openntpd constraints
net-misc/yt-dlp man
net-wireless/bluez readline extra-tools deprecated midi
diff --git a/.config/sys/etc/portage/package.use/sys b/.config/sys/etc/portage/package.use/sys
@@ -7,7 +7,7 @@ sys-apps/shadow su -cracklib
sys-apps/util-linux static-libs -su -suid -cramfs
sys-apps/xdg-desktop-portal flatpak
sys-boot/syslinux -efi
-sys-devel/binutils cxx static-libs
+sys-devel/binutils cxx gold static-libs
sys-devel/clang-runtime sanitize
sys-devel/gcc cxx fortran lto
sys-firmware/ipxe -savedconfig
diff --git a/.config/sys/etc/portage/package.use/x11 b/.config/sys/etc/portage/package.use/x11
@@ -1,5 +1,8 @@
x11-base/xorg-server -elogind -minimal suid
x11-libs/cairo svg
+x11-libs/gdk-pixbuf introspection
+x11-libs/gtk+ introspection
+x11-libs/libdrm video_cards_radeon # NOTE: needed by mesa for radeonsi support
x11-libs/libxcb xkb
+x11-libs/pango introspection
x11-themes/gtk-engines-murrine -themes
-x11-libs/libdrm video_cards_radeon
diff --git a/.config/sys/etc/portage/patches/media-gfx/inkscape/Avoid-std-shared_ptr-T-unique.patch b/.config/sys/etc/portage/patches/media-gfx/inkscape/Avoid-std-shared_ptr-T-unique.patch
@@ -1,23 +0,0 @@
-https://gitlab.com/inkscape/lib2geom/-/issues/74
-https://gitlab.com/inkscape/lib2geom/-/commit/9b1ff56ae90db7fbbceebaac3ccf521f6ceb32f4
-
----
- src/3rdparty/2geom/include/2geom/path.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/2geom/include/2geom/path.h b/src/3rdparty/2geom/include/2geom/path.h
-index f3042d7..f6fb759 100644
---- a/src/3rdparty/2geom/include/2geom/path.h
-+++ b/src/3rdparty/2geom/include/2geom/path.h
-@@ -843,7 +843,7 @@ private:
- void _unshare() {
- // Called before every mutation.
- // Ensure we have our own copy of curve data and reset cached values
-- if (!_data.unique()) {
-+ if (_data.use_count() != 1) {
- _data.reset(new PathData(*_data));
- _closing_seg = static_cast<ClosingSegment*>(&_data->curves.back());
- }
---
-2.45.2
-
diff --git a/.config/sys/etc/portage/repos.conf b/.config/sys/etc/portage/repos.conf
@@ -7,20 +7,14 @@ sync-type = git
sync-uri = https://anongit.gentoo.org/git/repo/sync/gentoo.git
[rnpnr]
-location = /usr/portage/local
+location = /usr/portage/rnpnr
priority = 1000
-[musl]
-location = /usr/portage/musl
-sync-type = git
-sync-uri = git://anongit.gentoo.org/proj/musl.git
-priority = 999
-
[haskell]
location = /usr/portage/haskell
sync-type = git
sync-uri = https://github.com/gentoo-haskell/gentoo-haskell.git
-priority = 998
+priority = 999
[guru]
location = /usr/portage/guru