diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-09-02 02:34:33 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-09-02 02:34:33 +0200 |
| commit | 5590fa26d1f7478d0cfb998e654fa162bf9bb6e9 (patch) | |
| tree | 9c641f463de1c13b14aa953d866011cf869f2cc5 | |
| parent | 5924eaed34b0a8ca15a2137b110cd51d8ee73607 (diff) | |
| download | gentoo-5590fa26d1f7478d0cfb998e654fa162bf9bb6e9.tar.gz gentoo-5590fa26d1f7478d0cfb998e654fa162bf9bb6e9.tar.bz2 gentoo-5590fa26d1f7478d0cfb998e654fa162bf9bb6e9.tar.xz gentoo-5590fa26d1f7478d0cfb998e654fa162bf9bb6e9.zip | |
Some flags to prevent circular dependencies during bootstrap
| -rw-r--r-- | extraconf/local.conf | 3 | ||||
| -rw-r--r-- | extraconf/remote.conf | 4 | ||||
| -rw-r--r-- | make.conf | 7 | ||||
| -rw-r--r-- | package.mask/darksoft.mask | 2 | ||||
| -rw-r--r-- | package.use/config.use | 4 | ||||
| -rw-r--r-- | package.use/enforced_circ.use | 4 | ||||
| -rw-r--r-- | package.use/package32.use | 1 | ||||
| -rw-r--r-- | scripts/bootstrap/fix_deps.sh | 8 |
8 files changed, 24 insertions, 9 deletions
diff --git a/extraconf/local.conf b/extraconf/local.conf new file mode 100644 index 0000000..c87e1fc --- /dev/null +++ b/extraconf/local.conf @@ -0,0 +1,3 @@ +FEATURES="$FEATURES -buildpkg getbinpkg" +PKGDIR="/var/cache/binpkgs" +PORTAGE_BINHOST="http://ipepdvcompute4.ipe.kit.edu/binpkgs/" diff --git a/extraconf/remote.conf b/extraconf/remote.conf new file mode 100644 index 0000000..23202ac --- /dev/null +++ b/extraconf/remote.conf @@ -0,0 +1,4 @@ +FEATURES="$FEATURES -getbinpkg usepkg buildpkg" +PKGDIR="/var/cache/binpkgs" + +USE="-driver" @@ -15,12 +15,12 @@ MAKEOPTS="-j59 -l5" # Default 2-jobs per localhost and 4-jobs per other nodes (increase recommended only on 4-head systems) DISTCC_HOSTS="localhost ipepdvcompute4/16" -FEATURES="distcc splitdebug -test" +FEATURES="${FEATURES} distcc splitdebug -test" #ccache is reported to cause problems. #FEATURES="ccache buildpkg getbinpkg nostrip" #FEATURES="-collision-protect" -USE="-systemd -consolekit elogind -doc multislot eselect ccache pch dbus timezone syslog unicode nls icu rcc" +USE_SYSTEM="-systemd -consolekit elogind -doc multislot eselect ccache pch dbus timezone syslog unicode nls icu rcc" USE_GENERAL="utils tools script scripts scripting extensions extras applet plugins importers imaging rendering stream video audio sound encode printsupport extra archive" USE_CONSOLE="ncurses bash-completion fish-completion zsh-completion" USE_DEVEL="python -ruby -fortran profile profiling systemtap nptl threads ithreads ipc libffi exceptions pcre16 graphite jit vala glib introspection" @@ -43,7 +43,7 @@ USE_WEBSRV="apache2 mysql mysqli sqlite http" USE_GEO="fits geos gml hdf hdf5 netcdf ogdi garmin gps mapnik gdal openstreetmap" USE_EMU="qemu kvm vde spice usbredir rdp" USE_MON="iostats hddtemp weather-metar weather-xoap" -USE="$USE $USE_GENERAL $USE_MATH $USE_OFFICE $USE_GEO $USE_MON $USE_WEBSRV $USE_FORMATS $USE_SOUND $USE_X11 $USE_WEB $USE_VIDEO $USE_SUBTITLES $USE_EMU $USE_HARDWARE $USE_NETWORK $USE_DEVEL $USE_SECURITY $USE_DESKTOP $USE_CONSOLE $USE_GRAPHICS $USE_STREAMING $USE_ID3" +USE="$USE $USE_SYSTEM $USE_GENERAL $USE_MATH $USE_OFFICE $USE_GEO $USE_MON $USE_WEBSRV $USE_FORMATS $USE_SOUND $USE_X11 $USE_WEB $USE_VIDEO $USE_SUBTITLES $USE_EMU $USE_HARDWARE $USE_NETWORK $USE_DEVEL $USE_SECURITY $USE_DESKTOP $USE_CONSOLE $USE_GRAPHICS $USE_STREAMING $USE_ID3" ACCEPT_LICENSE="*" LINGUAS="en de ru" @@ -69,4 +69,3 @@ PORTDIR_OVERLAY="/usr/local/portage/ /Image/My/DarkLin/portage/ $PORTDIR_OVERLAY #GENTOO_MIRRORS="http://gentoo.intergenia.de" FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp --no-check-certificate -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" - diff --git a/package.mask/darksoft.mask b/package.mask/darksoft.mask index 796bb79..fe1e4e9 100644 --- a/package.mask/darksoft.mask +++ b/package.mask/darksoft.mask @@ -20,4 +20,4 @@ # Key bindings >x11-terms/xterm-278-r2 # Problems with non-unicode characters in later versions ->x11-libs/vte-0.56.1:2.91 # Last patch +>x11-libs/vte-0.56.2:2.91 # Last patch diff --git a/package.use/config.use b/package.use/config.use index 43e61a2..0b6c192 100644 --- a/package.use/config.use +++ b/package.use/config.use @@ -33,10 +33,10 @@ sys-apps/util-linux tty-helpers static-libs # static-libs required by g sys-auth/pam_x509 -bluetooth # slotmove sys-devel/gcc 4.6 4.6.4 sys-devel/gcc:4.6.4 fortran # Lets keep it with one of the versions -www-client/elinks javascript +www-client/elinks javascript -samba net-print/cups -usb media-sound/pulseaudio realtime -libsamplerate native-headset -media-libs/mesa gles2 +media-libs/mesa gles2 -vaapi # -vaapi causes circular dependencies during bootstrap (not really needed) media-video/ffmpeg opus speex x11-base/xorg-server kdrive app-portage/g-sorcery bson git diff --git a/package.use/enforced_circ.use b/package.use/enforced_circ.use new file mode 100644 index 0000000..36f1b52 --- /dev/null +++ b/package.use/enforced_circ.use @@ -0,0 +1,4 @@ +virtual/libudev static-libs +media-libs/tiff -webp +dev-util/cmake -qt5 +app-text/xmlto -latex diff --git a/package.use/package32.use b/package.use/package32.use index 4c33612..d0fe981 100644 --- a/package.use/package32.use +++ b/package.use/package32.use @@ -318,6 +318,7 @@ media-libs/graphene abi_x86_32 >=net-libs/libpsl-0.21.0 abi_x86_32 >=media-libs/speexdsp-1.2_rc3-r2 abi_x86_32 >=dev-db/mysql-connector-c-6.1.11-r2 abi_x86_32 +>=sys-fs/eudev-3.2.5 static-libs abi_x86_32 #gcc dev-libs/boehm-gc abi_x86_32 diff --git a/scripts/bootstrap/fix_deps.sh b/scripts/bootstrap/fix_deps.sh index e27a8c0..2cccf4b 100644 --- a/scripts/bootstrap/fix_deps.sh +++ b/scripts/bootstrap/fix_deps.sh @@ -1,5 +1,9 @@ -# Ncurses/GPM circular dependency -USE="-gpm" emerge -1 ncurses +#! /bin/bash + +# Ncurses/GPM, pam/caps, pkgconfig/glib circular dependency +USE="${USE} -gpm" emerge -1 ncurses +USE="${USE} -filecaps" emerge -1 pam +USE="${USE} internal-glib" emerge -1 pkgconfig # Unmerge #emerge --depclean -a |