Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-03-03 20:14:22 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2018-03-03 20:14:22 +0100
commit0eb0a8e2998e3a25b76f1b39b8f3e8cbe303e367 (patch)
tree948ba986b47dc3c29074d94e952ac56ef3b18e56
parent499cf4bdd6ed942cafad91edcdfc60af30f98939 (diff)
building quite some more stage3 packages
-rwxr-xr-xbuild_stage3.sh81
-rw-r--r--i486-stage3/gcc/DESCR2
-rw-r--r--i486-stage3/groff/DESCR4
-rw-r--r--i486-stage3/libsasl/DESCR9
-rw-r--r--i486-stage3/man-db/DESCR4
-rw-r--r--i486-stage3/p11-kit/DESCR3
-rw-r--r--i486-stage3/shadow/DESCR18
-rw-r--r--i486-stage3/sqlite/DESCR4
-rwxr-xr-xinstall_host.sh3
9 files changed, 76 insertions, 52 deletions
diff --git a/build_stage3.sh b/build_stage3.sh
index 59aeb0e..0a8b64d 100755
--- a/build_stage3.sh
+++ b/build_stage3.sh
@@ -14,25 +14,45 @@ ncurses readline bash joe
attr acl m4 gmp gdbm db perl openssl
libunistring gettext perl-locale-gettext help2man
autoconf automake perl-error pcre2 git libtool
-zlib pambase cracklib flex pam libcap
+zlib pambase cracklib flex pam libcap coreutils
e2fsprogs expat bzip2 lz4 xz pcre less gzip
tar libarchive
icu
mpdecimal libffi
+nettle libidn libtasn1 p11-kit gnutls libgpg-error
elfutils sed texinfo grep findutils file diffutils ed patch
fakeroot
-bison
+check kbd bison shadow
inetutils bc kmod
net-tools libmnl
libedit
-mpfr gawk libmpc binutils gcc
+libatomic_ops gc mpfr gawk libmpc binutils
libunwind strace
argon2
+groff
+json-c
+libcap-ng
+libpipeline libseccomp man-db man-pages
+mdadm
+nano
+popt logrotate
+hwids pciutils
+keyutils
+sqlite
+vi
which
"
+#~ util-linux: libcap-ng
+
+# guile, guile2_0: libtool fails to find gc
+
+# gnupg: libgcrypt
+# libcgcryt: autodetection fails brilliantly, for instalce SSE 4.1
+# gets enabled!
+
#~ stage2:
-#~
+#
# git problem, not base of base-devel, but needed to checkout out via
# https+git protocoll. For now using the stage2 one
#
@@ -42,11 +62,12 @@ which
#~ git: python2 emacs libgnome-keyring xmlto asciidoc
#~
#~ libsasl: postgresql-libs libmariadbclient libldap krb5
+#~ libsasl: sqlite
#~ libldap: libsasl
-#~ krb5: e2fsprogs libldap keyutils
+#~ krb5: e2fsprogs libldap keyutils
+#~ keyutils: glibc sh
#~ libtirpc: krb5
-#~ coreutils
#~ util-linux:
#~ pkg-config: glib2
@@ -63,94 +84,57 @@ which
#~ gdb: python guile2.0
#~ pacman-mirrorlist archlinux-keyring archlinux32-keyring pacman
-#~ => kbd procps-ng <bison> shadow
+#~ <kbd> procps-ng <bison> <shadow>
#~ <inetutils> <bc> <kmod> linux
#~ <net-tools> <libmnl> <libnfnetlink> iptables iproute2
#~ <libedit> openssh
-#~ make <mpfr> <gawk> <libmpc> <binutils> <gcc> glibc
+#~ <make> <mpfr> <gawk> <libmpc> <binutils> <gcc> glibc
#~ <libunwind> <strace> gdb
#~ "
#~ #TODO after nasm: syslinux
# stage3 (from compute_dependencies.sh)
#~ ca-certificates-cacert: ca-certificates-utils
-#~ coreutils: glibc acl attr gmp libcap openssl
-#~ cracklib: glibc zlib
#~ cryptsetup: device-mapper libgcrypt popt libutil-linux json-c argon2
#~ dbus: libsystemd expat
#~ dhcpcd: glibc sh udev libsystemd
-#~ diffutils: glibc bash
-#~ e2fsprogs: sh libutil-linux
-#~ elfutils: gcc-libs zlib bzip2 xz
-#~ fakeroot: glibc filesystem sed util-linux sh
-#~ file: glibc zlib
-#~ findutils: glibc sh
-#~ flex: glibc m4 sh
-#~ gc: gcc-libs libatomic_ops
#~ glib2: pcre libffi libutil-linux zlib
-#~ gmp: gcc-libs sh
#~ gnupg: npth libgpg-error libgcrypt libksba libassuan pinentry bzip2 readline gnutls sqlite
-#~ gnutls: gcc-libs libtasn1 readline zlib nettle p11-kit libidn libunistring
-#~ groff: perl gcc-libs
-#~ guile: gmp libltdl ncurses texinfo libunistring gc libffi
#~ guile2.0: gmp libltdl ncurses texinfo libunistring gc libffi
#~ iptables: glibc bash libnftnl libpcap
#~ iputils: openssl sysfsutils libcap libidn
#~ jfsutils: util-linux
-#~ json-c: glibc
-#~ kbd: glibc pam
-#~ keyutils: glibc sh
#~ ldns: openssl dnssec-anchors
#~ libarchive: acl attr bzip2 expat lz4 openssl xz zlib
#~ libassuan: libgpg-error
-#~ libatomic_ops: glibc
-#~ libcap: glibc attr
-#~ libcap-ng: glibc
-#~ libedit: ncurses
#~ libgcrypt: libgpg-error
-#~ libgpg-error: glibc sh
-#~ libidn: glibc
#~ libksba: bash libgpg-error glibc
-#~ libmpc: mpfr
#~ libnfnetlink: glibc
#~ libnftnl: libmnl
#~ libnghttp2: glibc
#~ libnl: glibc
#~ libpcap: glibc libnl sh libusbx dbus
-#~ libpipeline: glibc
-#~ libseccomp: glibc
#~ libsecret: glib2 libgcrypt
#~ libssh2: openssl
-#~ libtasn1: glibc
#~ libtirpc: krb5
#~ libusb: glibc libsystemd
-#~ logrotate: popt gzip acl
#~ make: glibc guile
-#~ man-db: bash gdbm zlib groff libpipeline less libseccomp
-#~ mdadm: glibc
#~ mkinitcpio: awk mkinitcpio-busybox kmod util-linux libarchive coreutils bash findutils grep filesystem gzip systemd
-#~ nano: ncurses file sh
#~ netctl: coreutils iproute2 openresolv systemd
-#~ nettle: gmp
#~ openresolv: bash
#~ openssh: krb5 openssl libedit ldns
-#~ p11-kit: glibc libtasn1 libffi
#~ pacman: bash glibc libarchive curl gpgme pacman-mirrorlist archlinux-keyring
-#~ pciutils: glibc hwids kmod
#~ pcmciautils: systemd
#~ pinentry: ncurses libcap libassuan libsecret
#~ pkg-config: glib2
-#~ popt: glibc
#~ procps-ng: ncurses libsystemd
#~ psmisc: ncurses
#~ reiserfsprogs: util-linux
#~ s-nail: openssl krb5 libidn
-#~ shadow: bash pam acl
#~ sudo: glibc libgcrypt pam libldap
#~ sysfsutils: glibc
#~ thin-provisioning-tools: expat gcc-libs libaio
#~ usbutils: libusb hwids
-#~ vi: ncurses
#~ xfsprogs: sh libutil-linux readline
#~ base cryptsetup
@@ -159,12 +143,7 @@ which
#~ base iputils
#~ base jfsutils
#~ base licenses
-#~ base logrotate
#~ base lvm2
-#~ base man-db
-#~ base man-pages
-#~ base mdadm
-#~ base nano
#~ base netctl
#~ base pciutils
#~ base pcmciautils
@@ -173,9 +152,7 @@ which
#~ base s-nail
#~ base systemd-sysvcompat
#~ base usbutils
-#~ base vi
#~ base xfsprogs
-#~ base-devel groff
#~ base-devel sudo
#~ base-devel systemd
diff --git a/i486-stage3/gcc/DESCR b/i486-stage3/gcc/DESCR
index 3761a9c..2e493e1 100644
--- a/i486-stage3/gcc/DESCR
+++ b/i486-stage3/gcc/DESCR
@@ -2,6 +2,8 @@
sed -i "/makedepends=/s/doxygen//" PKGBUILD
sed -i 's/doc-man-doxygen//' PKGBUILD
sed -i 's/doc-install-man//' PKGBUILD
+sed -i '/# make documentation/{n;s/make/#make/}' PKGBUILD
+sed -i '/# install the libstdc++ man pages/{n;s/make/#make/}' PKGBUILD
# no ADA
sed -i "/makedepends=/s/gcc-ada//" PKGBUILD
diff --git a/i486-stage3/groff/DESCR b/i486-stage3/groff/DESCR
new file mode 100644
index 0000000..098a3cb
--- /dev/null
+++ b/i486-stage3/groff/DESCR
@@ -0,0 +1,4 @@
+# no optional dependencies for gross, especially no dependency on X
+sed -i "/makedepends=/s/'netpbm'//" PKGBUILD
+sed -i "/makedepends=/s/'psutils'//" PKGBUILD
+sed -i "/makedepends=/s/'libxaw'//" PKGBUILD
diff --git a/i486-stage3/libsasl/DESCR b/i486-stage3/libsasl/DESCR
new file mode 100644
index 0000000..42d18dc
--- /dev/null
+++ b/i486-stage3/libsasl/DESCR
@@ -0,0 +1,9 @@
+# libsasl needs libdlap, but libldap can use libsasl? break the cyrcle..
+sed -i "/makedepends=/s/libldap//" PKGBUILD
+
+# breaking the krb5 needs libldap needs libsasl needs krb5 cycle..
+sed -i "/makedepends=/s/krb5//" PKGBUILD
+
+# no database bindings
+sed -i "/makedepends=/s/postgresql-libs//" PKGBUILD
+sed -i "/makedepends=/s/libmariadbclient//" PKGBUILD
diff --git a/i486-stage3/man-db/DESCR b/i486-stage3/man-db/DESCR
new file mode 100644
index 0000000..cb26317
--- /dev/null
+++ b/i486-stage3/man-db/DESCR
@@ -0,0 +1,4 @@
+# disable makedepends and take out po4a
+sed -i "/makedepends=/s/po4a//" PKGBUILD
+#sed -i 's@\(cd doc\)@#\1@g' PKGBUILD
+#sed -i 's@\(po4a\)@#\1@g' PKGBUILD
diff --git a/i486-stage3/p11-kit/DESCR b/i486-stage3/p11-kit/DESCR
new file mode 100644
index 0000000..abee97c
--- /dev/null
+++ b/i486-stage3/p11-kit/DESCR
@@ -0,0 +1,3 @@
+# no documentation
+sed -i "/makedepends=/s/gtk-doc//" PKGBUILD
+sed -i "s@--enable-doc@--disable-doc@" PKGBUILD
diff --git a/i486-stage3/shadow/DESCR b/i486-stage3/shadow/DESCR
new file mode 100644
index 0000000..e9f6de8
--- /dev/null
+++ b/i486-stage3/shadow/DESCR
@@ -0,0 +1,18 @@
+# remove docu and git dependencies
+sed -i "/makedepends=/s/'git'//" PKGBUILD
+sed -i "/makedepends=/s/'libxslt'//" PKGBUILD
+sed -i "/makedepends=/s/'docbook-xsl'//" PKGBUILD
+sed -i "/makedepends=/s/'gnome-doc-utils'//" PKGBUILD
+
+# building man pages needs xml2po, disable it
+sed -i 's@--enable-man@--disable-man@g' PKGBUILD
+sed -i '/find/,/-delete/{s/\(.*\)/#\1/g}' PKGBUILD
+sed -i '/rmdir/,/man8/{s/\(.*\)/#\1/g}' PKGBUILD
+# counterspells, yes I know, I'm bad with sed
+sed -i 's/^#}/}/' PKGBUILD
+# shadow: /usr/sbin exists in filesystem
+# revert last rmdir commenting of /usr/sbin removal
+sed -i 's@^# \+rmdir \+"$pkgdir/usr/sbin"@ rmdir "$pkgdir/usr/sbin"@' PKGBUILD
+
+sed -i '2!N; /prepare()/ a \ sed -i "/SUBDIRS/s/man//g" Makefile.am' PKGBUILD
+
diff --git a/i486-stage3/sqlite/DESCR b/i486-stage3/sqlite/DESCR
new file mode 100644
index 0000000..9d8b16e
--- /dev/null
+++ b/i486-stage3/sqlite/DESCR
@@ -0,0 +1,4 @@
+# TODO: or build tcl? we need it later for testing the toolchain anyway
+# no dependency on tcl
+sed -i "/makedepends=/s/tcl//" PKGBUILD
+
diff --git a/install_host.sh b/install_host.sh
index cfe9399..95445a9 100755
--- a/install_host.sh
+++ b/install_host.sh
@@ -42,6 +42,9 @@ case $BUILD_CPU in
;;
esac
+# for groff
+pacman --noconfirm --needed -S xorg-util-macros
+
# for building git (stage 2)
pacman --noconfirm --needed -S libgnome-keyring xmlto