From 4787efe6ce42a3bffb6820d3a29c02072e205900 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 8 Feb 2018 16:32:24 +0100
Subject: some stage 1 cleanup

---
 i486-stage1/curl/DESCR   |  4 ++++
 i486-stage1/gcc/DESCR    | 28 ++++++++++++++++++++++++++++
 i486-stage1/pacman/DESCR |  6 ++----
 3 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'i486-stage1')

diff --git a/i486-stage1/curl/DESCR b/i486-stage1/curl/DESCR
index 88b092f..f27630e 100644
--- a/i486-stage1/curl/DESCR
+++ b/i486-stage1/curl/DESCR
@@ -15,6 +15,7 @@ sed -i '/--prefix=\/usr/ a \      --without-libpsl \\' PKGBUILD
 sed -i "/depends=/s/'libnghttp2'//" PKGBUILD
 sed -i '/--prefix=\/usr/ a \      --without-nghttp2 \\' PKGBUILD
 sed -i '/--prefix=\/usr/ a \      --without-gssapi \\' PKGBUILD
+sed -i 's/--with-gssapi/--without-gssapi/g' PKGBUILD
 
 # no ca-certificates, needs tons of tools to build (like p11-kit), so we 
 # create a fake one with certificates from the host (the ca crts from
@@ -24,3 +25,6 @@ sed -i "/depends=/s/'ca-certificates'//" PKGBUILD
 
 # zsh, perl is used to create a completion file for curl and zsh
 sed -i '/--prefix=\/usr/ a \      --without-zsh-functions-dir \\' PKGBUILD
+
+# don't build the manual
+sed -i 's/--enable-manual/--disable-manual/g' PKGBUILD
diff --git a/i486-stage1/gcc/DESCR b/i486-stage1/gcc/DESCR
index 4947ec8..c2d96ee 100644
--- a/i486-stage1/gcc/DESCR
+++ b/i486-stage1/gcc/DESCR
@@ -1,6 +1,15 @@
 # prepare configure for cross-compilation
 sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKGBUILD
 
+# TODO: how to make this a hook for the stage1 builder?
+# aftermatch for gcc/binutils
+#collect2: unable to find ld
+#=> this is the cross compiled gcc for i486 inside the chroot, it expects
+#   its platform dependend stuff in /usr/lib/gcc/i486-unknown-linux-gnu/7.2.0
+#=> we can temporarily fix this:
+#sudo ln -s /usr/bin/ld $STAGE1_CHROOT/usr/lib/gcc/i486-unknown-linux-gnu/7.2.0/ld
+
+
 # TODO from here: make it all patches, once  our own PKGBUILD works
 
 # gcc
@@ -40,3 +49,22 @@ sed -i "s@./configure@./configure --host=$TARGET_ARCH --build=$BUILD_ARCH@g" PKG
 # disable all languages but C and C++
 #use gcc-cross-PKGBUILD
 
+# more TODOs:
+#rm "$pkgdir"/usr/share/info/{gccgo,gfortran.info}
+# rm: cannot remove ???/home/cross/build/gcc/pkg/gcc/usr/share/info/gccgo???: No such file or directory
+#  rm "$pkgdir"/usr/share/info/{gccgo,gfortran.info}
+#https://bugs.archlinux.org/task/57421
+#/home/cross/x-tools/i486-unknown-linux-gnu/lib/gcc/i486-unknown-linux-gnu/4.9.4/../../../../i486-unknown-linux-gnu/bin/ld: cannot find -lquadmath
+#collect2: error: ld returned 1 exit status
+#libtool: install: error: relink `libgfortran.la' with the above command before installing it
+#make: *** [Makefile:1331: install-toolexeclibLTLIBRARIES] Error 1
+#make: Leaving directory '/home/cross/build/gcc/src/gcc-build/i486-unknown-linux-gnu/libgfortran'
+#==> ERROR: A failure occurred in package_gcc-libs().
+#    Aborting...
+#=> libquadmath must be retooled before libfortran
+#=> nope libfortran simply fails to relink => remove it
+#
+#install: cannot stat ???/home/cross/build/gcc/src/gcc/COPYING.RUNTIME???: No such file or directory
+#=> sweet, remove it
+#
+#test.c:1:10: fatal error: stdio.h: No such file or directory
diff --git a/i486-stage1/pacman/DESCR b/i486-stage1/pacman/DESCR
index a3fc76e..f531620 100644
--- a/i486-stage1/pacman/DESCR
+++ b/i486-stage1/pacman/DESCR
@@ -7,12 +7,10 @@ sed -i "1!N;/depends=/s/'gpgme'//" PKGBUILD
 sed -i 's@./configure@./configure --without-gpgme@' PKGBUILD
 
 # asciidoc is a makedepend, we can use the one on the host (this means
-# also we can pacman only rebuild on i486 itself after the whole python
-# zoo is installed)
+# also we can pacman only rebuild on i486 itself after python has been
+# installed)
 sed -i "/makedepends=/s/'asciidoc'//" PKGBUILD
 
-#TODO FROM HERE
-
 # craft a temporary i486 pacman.conf (no gpg and hard-coded architecture)
 cp pacman.conf.i686 pacman.conf.i486
 sed -i 's@^\(SigLevel\)@#\1@' pacman.conf.i486
-- 
cgit v1.2.3-54-g00ecf