4 files changed, 35 insertions, 3 deletions
diff --git a/README b/README
index 6c1ac66..49680d8 100644
--- a/README
+++ b/README
@@ -250,6 +250,12 @@ su cross ./prepare_stage3_repo.sh
 
 # We also try to get a running systemd in this stage.
 
+# Ommitting the following in this stage:
+# - bootstrapping issues:
+#   - gcc-ada: needs a running ada to build
+#   - java-runtime: nedds another java-runtime to build
+#   - vala: needs another vala to build
+
 su cross ./prepare_stage4_repo.sh
 
 # Build stage 4 on the target architecture and install it onto the
diff --git a/build_stage4.sh b/build_stage4.sh
index ea4f7d7..2fcde63 100755
--- a/build_stage4.sh
+++ b/build_stage4.sh
@@ -11,16 +11,36 @@
 
 PACKAGES="iana-etc filesystem linux-api-headers tzdata
 ncurses readline bash joe nano vi
+libxml2 emacs-nox
 attr acl m4 gmp gdbm db perl openssl
 libunistring gettext perl-locale-gettext help2man
-autoconf
+autoconf tcl expect dejagnu cscope automake
 "
 
+# automake:
+# Testsuite summary for GNU Automake 1.15.1
+# ============================================================================
+# TOTAL: 2901
+# PASS:  2767
+# SKIP:  85
+# XFAIL: 41
+# FAIL:  8
+# XPASS: 0
+# ERROR: 0
+# FAIL: t/instmany-python.sh
+# FAIL: t/py-compile-basic.sh
+# FAIL: t/py-compile-basedir.sh
+# FAIL: t/py-compile-destdir.sh
+# FAIL: t/py-compile-option-terminate.sh
+# FAIL: t/python3.sh
+# FAIL: t/python10.sh
+# FAIL: t/python12.sh
+
 #~ stage2:
 #~ PACKAGES="
 #~    
 #~     
-#~    automake perl-error pcre2 git libtool
+#~      perl-error pcre2 git libtool
 #~ zlib pambase cracklib libtirpc flex pam libcap coreutils
 #~ util-linux pkg-config e2fsprogs expat bzip2 lz4 xz pcre less gzip
 #~ tar libarchive curl
diff --git a/i486-stage4/autoconf/DESCR b/i486-stage4/autoconf/DESCR
index a678d74..e9d0e50 100644
--- a/i486-stage4/autoconf/DESCR
+++ b/i486-stage4/autoconf/DESCR
@@ -5,7 +5,8 @@ sed -i "/checkdepends=(/s/checkdepends=('gcc-go' //" PKGBUILD
 #  38: autotools and whitespace in file names          FAILED (tools.at:1310)
 # => curiously not happending on this version!?
 
-# autoconf: 351 Go: https://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00000.html
+# autoconf: 351 Go: https://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00000.html,
+# see FS#57870
 sed -i 's@source=(@source=(autoconf-2.69-go-test-351-OpenFile.patch @' PKGBUILD
 sed -i "s@md5sums=(@md5sums=('a7e1e05d4372b2ef5fae29b59e677e7d' @" PKGBUILD
 sed -i '/patch -p1.*libtool/ a \  patch -Np1 -i "${srcdir}/autoconf-2.69-go-test-351-OpenFile.patch"' PKGBUILD
diff --git a/i486-stage4/automake/DESCR b/i486-stage4/automake/DESCR
new file mode 100644
index 0000000..88466e8
--- /dev/null
+++ b/i486-stage4/automake/DESCR
@@ -0,0 +1,5 @@
+# no vala
+sed -i "/checkdepends=/s/'vala'//" PKGBUILD
+
+# no java
+sed -i "/checkdepends=/s/'java-environment'//" PKGBUILD