summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-10-27 02:34:08 +0100
committerSuren A. Chilingaryan <csa@suren.me>2019-10-27 02:34:08 +0100
commitfade0570ec676c3106f866040f913cedcdcef4cc (patch)
tree3c4ebf758d6aa3f5c47718ffeb53c2bbfc2211a0
parent5405fe336b06678a6a61b7d2689a5f488a7a084b (diff)
downloadgentoo-fade0570ec676c3106f866040f913cedcdcef4cc.tar.gz
gentoo-fade0570ec676c3106f866040f913cedcdcef4cc.tar.bz2
gentoo-fade0570ec676c3106f866040f913cedcdcef4cc.tar.xz
gentoo-fade0570ec676c3106f866040f913cedcdcef4cc.zip
Fix building mkinitrd
-rw-r--r--env/relaxed.conf1
-rw-r--r--package.env/package.env1
-rw-r--r--package.mask/darksoft.mask2
-rw-r--r--scripts/bootstrap/fix_deps.sh14
4 files changed, 14 insertions, 4 deletions
diff --git a/env/relaxed.conf b/env/relaxed.conf
new file mode 100644
index 0000000..6490f7b
--- /dev/null
+++ b/env/relaxed.conf
@@ -0,0 +1 @@
+FEATURES="-multilib-strict"
diff --git a/package.env/package.env b/package.env/package.env
index 76c6687..83738b3 100644
--- a/package.env/package.env
+++ b/package.env/package.env
@@ -9,3 +9,4 @@ sys-libs/ldb nonparallel.conf
net-fs/samba nonparallel.conf
dev-python/pycuda cuda.conf
sci-geosciences/mkgmap network.conf
+sys-apps/mkinitrd relaxed.conf
diff --git a/package.mask/darksoft.mask b/package.mask/darksoft.mask
index 7b5178b..d7738b8 100644
--- a/package.mask/darksoft.mask
+++ b/package.mask/darksoft.mask
@@ -19,5 +19,5 @@
#>dev-lang/php-5.5.17-r1
# Key bindings
->x11-terms/xterm-278-r2 # Problems with non-unicode characters in later versions
+>x11-terms/xterm-278-r3 # Problems with non-unicode characters in later versions
>x11-libs/vte-0.56.2:2.91 # Last patch
diff --git a/scripts/bootstrap/fix_deps.sh b/scripts/bootstrap/fix_deps.sh
index 2cccf4b..c5ccd3b 100644
--- a/scripts/bootstrap/fix_deps.sh
+++ b/scripts/bootstrap/fix_deps.sh
@@ -1,9 +1,17 @@
#! /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
+if [ ! /usr/bin/pkg-config ]; then
+ USE="${USE} -gpm" emerge -1 ncurses
+ USE="${USE} -filecaps" emerge -1 pam
+ USE="${USE} internal-glib" emerge -1 pkgconfig
+fi
+
+# Some applications requires latest version of OpenCL standard, intel provides one
+[ -f /etc/OpenCL/vendors/intelocl64.icd ] || emerge -u1 intel-ocl-sdk && eselect opencl set intel
+
+# Preparing kernel
+[ -f /usr/src/linux/.config ] || emerge -1 gentoo-sources && yes "" | make -C /usr/src/linux oldconfig
# Unmerge
#emerge --depclean -a