diff options
| -rwxr-xr-x | build_stage4.sh | 6 | ||||
| -rwxr-xr-x | build_stage4_package.sh | 4 | ||||
| -rw-r--r-- | i486-stage4/git/DESCR | 2 | ||||
| -rw-r--r-- | i486-stage4/pcre2/DESCR | 6 |
4 files changed, 14 insertions, 4 deletions
diff --git a/build_stage4.sh b/build_stage4.sh index efde59c..4859a64 100755 --- a/build_stage4.sh +++ b/build_stage4.sh @@ -15,14 +15,16 @@ libxml2 emacs-nox attr acl m4 gmp gdbm db perl openssl libunistring gettext perl-locale-gettext help2man autoconf tcl expect dejagnu cscope automake +perl-test-pod perl-devel-symdump perl-pod-coverage +perl-test-pod-coverage perl-error pcre2 +docbook-xml libxslt docbook-xsl xmlto asciidoc git " - #~ stage2: #~ PACKAGES=" #~ #~ -#~ perl-error pcre2 git libtool +#~ 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/build_stage4_package.sh b/build_stage4_package.sh index 0211315..ad3a656 100755 --- a/build_stage4_package.sh +++ b/build_stage4_package.sh @@ -102,7 +102,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l echo "Building $PACKAGE on target.." - if test "$SKIP_CHECK"; then + if test "$SKIP_CHECK" = "1"; then TESTING="--nocheck" else TESTING="" @@ -137,7 +137,7 @@ if test "$(find "$STAGE4_PACKAGES" -regex ".*/$PACKAGE-.*pkg\\.tar\\.xz" | wc -l # install onto stage 1 system via pacman - if test "$FORCE_INSTALL"; then + if test "$FORCE_INSTALL" = "1"; then FORCE="--force" fi diff --git a/i486-stage4/git/DESCR b/i486-stage4/git/DESCR new file mode 100644 index 0000000..b8d96cd --- /dev/null +++ b/i486-stage4/git/DESCR @@ -0,0 +1,2 @@ +# no Gnome, draws in tons of things we don't want for a base system +sed -i "/makedepends=/s/'libgnome-keyring'//" PKGBUILD diff --git a/i486-stage4/pcre2/DESCR b/i486-stage4/pcre2/DESCR new file mode 100644 index 0000000..56ea041 --- /dev/null +++ b/i486-stage4/pcre2/DESCR @@ -0,0 +1,6 @@ +# pcre2 configure, overload CFLAGS and CXXFLAGS to avoid optimization +# using MMX registers (default in gcc) +sed -i 's@./configure@CFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="-march=i486 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt" ./configure@' PKGBUILD + +# disable JIT, contains hard coded XMM registers +sed -i 's/--enable-jit/--disable-jit/' PKGBUILD |