Merge pull request #275 from fosslinux/parallelism

Parallelism
This commit is contained in:
fosslinux 2023-04-14 01:33:17 +00:00 committed by GitHub
commit 445628d722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
82 changed files with 323 additions and 112 deletions

View File

@ -43,7 +43,7 @@ jobs:
key: cache-${{ hashFiles('sys*/*/sources') }}
- name: Run bootstrap
id: bootstrap
run: ./rootfs.py --bwrap --external-sources --preserve
run: ./rootfs.py --bwrap --external-sources --preserve --cores 2
- name: Archive created packages
if: steps.bootstrap.conclusion == 'success'
uses: actions/upload-artifact@v3

View File

@ -965,15 +965,16 @@ boehm-gc 8.0.4
The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage
collecting replacement for C malloc or C++ new.
guile 3.0.7
guile 3.0.9
===========
GNU Ubiquitous Intelligent Language for Extensions (GNU Guile) is the preferred
extension language system for the GNU Project and features an implementation
of the programming language Scheme.
We use ``guile-psyntax-bootstrapping`` project to bootstrap Guile's ``psyntax.pp``
without relying on pre-expanded code.
We use ``guile-psyntax-bootstrapping`` project on Guile 3.0.7 to bootstrap
Guile's ``psyntax.pp`` without relying on pre-expanded code. This is then
transplanted into Guile 3.0.9.
which 2.21
==========

View File

@ -29,10 +29,11 @@ def create_configuration_file(args):
"""
config_path = os.path.join('sysa', 'bootstrap.cfg')
with open(config_path, "w", encoding="utf_8") as config:
config.write("FORCE_TIMESTAMPS=" + str(args.force_timestamps) + "\n")
config.write("CHROOT=" + str(args.chroot or args.bwrap) + "\n")
config.write("CHROOT_ONLY_SYSA=" + str(args.bwrap) + "\n")
config.write("UPDATE_CHECKSUMS=" + str(args.update_checksums) + "\n")
config.write(f"FORCE_TIMESTAMPS={args.force_timestamps}\n")
config.write(f"CHROOT={args.chroot or args.bwrap}\n")
config.write(f"CHROOT_ONLY_SYSA={args.bwrap}\n")
config.write(f"UPDATE_CHECKSUMS={args.update_checksums}\n")
config.write(f"JOBS={args.cores}\n")
config.write("DISK=sda1\n")
if (args.bare_metal or args.qemu) and not args.kernel:
config.write("KERNEL_BOOTSTRAP=True\n")
@ -61,6 +62,8 @@ def main():
action="store_true")
parser.add_argument("--tmpfs-size", help="Size of the tmpfs",
default="8G")
parser.add_argument("--cores", help="Cores to use for building",
default=2)
parser.add_argument("--force-timestamps",
help="Force all files timestamps to be 0 unix time",
action="store_true")
@ -119,6 +122,10 @@ def main():
if args.bwrap and args.tmpfs:
raise ValueError("tmpfs cannot be used with bwrap.")
# Cores validation
if int(args.cores) < 1:
raise ValueError("Must use one or more cores.")
# bootstrap.cfg
if args.bare_metal:
args.no_create_config = True
@ -221,6 +228,7 @@ print(shutil.which('chroot'))
run(args.qemu_cmd,
'-enable-kvm',
'-m', str(args.qemu_ram) + 'M',
'-smp', str(args.cores),
'-no-reboot',
'-hda', tmpdir.get_disk("sysc"),
'-nic', 'user,ipv6=off,model=e1000',
@ -233,6 +241,7 @@ print(shutil.which('chroot'))
run(args.qemu_cmd,
'-enable-kvm',
'-m', "4G",
'-smp', str(args.cores),
'-no-reboot',
'-drive', 'file=' + os.path.join(system_a.tmp_dir, 'sysa.img') + ',format=raw',
'-machine', 'kernel-irqchip=split',

View File

@ -9,7 +9,7 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_
298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b autoconf-2.69_0.tar.bz2
8c2401edf1c68910005bbcb8b8e84727a46f7d9643d2ad1267bd0259078dadc4 autoconf-2.71_0.tar.bz2
6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2
986995c084f3542b61938d11ddb6f1dc3b33263e4681abdce5ede2b724a1d5ea autogen-5.18.16_0.tar.bz2
ebd9b5168122561aca6f9c686f97cf1b61b035eccb716f36710efe72aad694f0 autogen-5.18.16_0.tar.bz2
02a426e82a52d4a2cd7e73fe3dc5a2c58b3ed100f24a92c57e42511fd86e247c automake-1.10.3_0.tar.bz2
34925adeaa2876a5e068adeb17b71fe7c7105244c3cb5439d33f7406310674da automake-1.11.2_0.tar.bz2
a7bd12bd0c639783ce1c0e9f640cf004a87460bbda8154bc550c5e6884457b48 automake-1.15.1_0.tar.bz2
@ -57,7 +57,7 @@ a2301d8dbbfbfcdd18444f01848e8e4366780281009640acbd3af0fab9b11aea gcc-4.7.4_0.ta
db3f8088a8aa74a7ff300b45c2070397ed7538fe5cc45480ea968014ccf7bc20 gperf-3.1_0.tar.bz2
67d706423e079a9cd764fd9607027d296c0ff2380c1104006a2230a299eb2c1d grep-2.4_0.tar.bz2
d85cff8f9ff76533287891ec2019416fa585815e514743e5b76efd9f17f5ef5c grep-3.7_0.tar.bz2
adcd3633d004a608cb36e306dd887d96e2ab77bfc5d5b4d6fa93ccc871ae2285 guile-3.0.7_0.tar.bz2
b38422d646590600444f0ff12fee6fd738baaf471338aa67899db950d3521127 guile-3.0.9_0.tar.bz2
8d2015b87337abbf287f7a39ee4cf53514120b5d3e90a93fe7d533dcc43f14fa help2man-1.36.4_0.tar.bz2
3f06d1a7f1b1770d4550ff6316c7f06fd26e30bddad7c1b665f1fae80e409c8c kbd-1.15_0.tar.bz2
2a661da13801028f5af98e5d9f6de417c21c90df1bcef4809caf0c2094fdd8f4 kexec-tools-2.0.22_0.tar.bz2

View File

@ -31,7 +31,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true DESTDIR="${DESTDIR}"
make "${MAKEJOBS}" MAKEINFO=true DESTDIR="${DESTDIR}"
}
src_install() {

View File

@ -33,7 +33,7 @@ src_compile() {
# Workaround for racy make dependencies
make -C bin autom4te
make -C lib
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -27,7 +27,7 @@ src_compile() {
make -C bin autom4te
make -C lib
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -25,7 +25,7 @@ src_compile() {
# Workaround for racy make dependencies
make -C bin autom4te
make -C lib
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -25,7 +25,7 @@ src_compile() {
# Workaround for racy make dependencies
make -C bin autom4te
make -C lib
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -19,7 +19,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make -j1 MAKEINFO=true PREFIX="${PREFIX}"
}
src_install() {

View File

@ -18,7 +18,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -18,7 +18,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -19,7 +19,7 @@ src_configure() {
}
src_compile() {
AUTOM4TE=autom4te-2.61 make MAKEINFO=true CC=tcc
AUTOM4TE=autom4te-2.61 make "${MAKEJOBS}" MAKEINFO=true CC=tcc
}
src_install() {

View File

@ -20,7 +20,7 @@ src_configure() {
}
src_compile() {
AUTORECONF=autoreconf-2.64 AUTOM4TE=autom4te-2.64 AUTOHEADER=autoheader-2.64 AUTOCONF=autoconf-2.64 make MAKEINFO=true
AUTORECONF=autoreconf-2.64 AUTOM4TE=autom4te-2.64 AUTOHEADER=autoheader-2.64 AUTOCONF=autoconf-2.64 make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -22,7 +22,7 @@ src_configure() {
}
src_compile() {
AUTORECONF=autoreconf-2.69 AUTOM4TE=autom4te-2.69 AUTOHEADER=autoheader-2.69 AUTOCONF=autoconf-2.69 make MAKEINFO=true
AUTORECONF=autoreconf-2.69 AUTOM4TE=autom4te-2.69 AUTOHEADER=autoheader-2.69 AUTOCONF=autoconf-2.69 make -j1 MAKEINFO=true
}
src_install() {

View File

@ -13,7 +13,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -15,7 +15,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -13,7 +13,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -14,7 +14,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -39,6 +39,10 @@ src_configure() {
bash_cv_dev_fd=whacky
}
src_compile() {
make -j1
}
src_install() {
install -D bash "${DESTDIR}${PREFIX}/bin/bash"
# Work around weird symlink bug

View File

@ -18,4 +18,3 @@ src_configure() {
./configure --prefix="${PREFIX}" \
--build=i386-unknown-linux-musl
}

View File

@ -88,7 +88,7 @@ src_configure() {
src_compile() {
make -C bfd headers
for dir in libiberty zlib bfd opcodes binutils gas gprof ld; do
make -C $dir tooldir=${PREFIX} CPPFLAGS="-DPLUGIN_LITTLE_ENDIAN" MAKEINFO=true
make "${MAKEJOBS}" -C $dir tooldir=${PREFIX} CPPFLAGS="-DPLUGIN_LITTLE_ENDIAN" MAKEINFO=true
done
}

View File

@ -19,3 +19,7 @@ src_prepare() {
cp ../../mk/lib.mk lib/Makefile
cp ../../mk/src.mk src/Makefile
}
src_compile() {
make -j1 -f Makefile PREFIX="${PREFIX}"
}

View File

@ -19,3 +19,7 @@ src_prepare() {
cp ../../mk/lib.mk lib/Makefile
cp ../../mk/src.mk src/Makefile
}
src_compile() {
make -j1 -f Makefile PREFIX="${PREFIX}"
}

View File

@ -16,3 +16,7 @@ src_prepare() {
cp ../../mk/lib.mk lib/Makefile
cp ../../mk/src.mk src/Makefile
}
src_compile() {
make -j1 -f Makefile PREFIX="${PREFIX}"
}

View File

@ -9,7 +9,7 @@ src_prepare() {
}
src_compile() {
make CC=tcc AR="tcc -ar" bzip2
make "${MAKEJOBS}" CC=tcc AR="tcc -ar" bzip2
}
src_install() {

View File

@ -25,7 +25,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true DESTDIR="${DESTDIR}"
make "${MAKEJOBS}" MAKEINFO=true DESTDIR="${DESTDIR}"
}
src_install() {

View File

@ -11,6 +11,10 @@ src_prepare() {
rm parse.c parse.h scan.c skel.c
}
src_compile() {
make -j1 PREFIX="${PREFIX}"
}
src_install() {
if test -d /lex; then
# Remove lex, later make install will symlink lex to flex

View File

@ -12,7 +12,7 @@ src_prepare() {
src_compile() {
cd src
default
make -j1 PREFIX="${PREFIX}"
cd ..
}

View File

@ -93,7 +93,7 @@ src_compile() {
mkdir build/gcc/include
ln -s ../../../gcc/gsyslimits.h build/gcc/include/syslimits.h
for dir in libiberty libcpp gcc; do
make -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" STMP_FIXINC=
make "${MAKEJOBS}" -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" STMP_FIXINC=
done
}

View File

@ -87,7 +87,7 @@ src_configure() {
src_compile() {
ln -s . build/build-i386-unknown-linux-musl
for dir in libiberty libcpp gcc; do
make -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" STMP_FIXINC=
make "${MAKEJOBS}" -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" STMP_FIXINC=
done
}

View File

@ -18,7 +18,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -321,7 +321,7 @@ default_src_configure() {
# Default function for compiling source. It simply runs make without any parameters.
default_src_compile() {
make -f Makefile PREFIX="${PREFIX}"
make "${MAKEJOBS}" -f Makefile PREFIX="${PREFIX}"
}
# Default installing function. PREFIX should be set by run.sh script.

View File

@ -22,7 +22,7 @@ src_configure() {
src_compile() {
# Missing dependency in Makefile
flex -o src/analyze.c src/analyze.l
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -29,7 +29,7 @@ src_configure() {
}
src_compile() {
make AUTOM4TE=autom4te-2.61 MAKEINFO=true
make "${MAKEJOBS}" AUTOM4TE=autom4te-2.61 MAKEINFO=true
}
src_install() {

View File

@ -50,8 +50,8 @@ src_compile() {
generate_autoconf_h
# Allow use of patched initramfs_list.sh (which is required anyway)
make ARCH=i386 prepare
PATH="${PWD}/usr:${PATH}" make ARCH=i386
make "${MAKEJOBS}" ARCH=i386 prepare
PATH="${PWD}/usr:${PATH}" make "${MAKEJOBS}" ARCH=i386
# Clear up more space
find . -name '*.o' -delete

View File

@ -20,7 +20,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO="true"
make "${MAKEJOBS}" MAKEINFO="true"
}
src_install() {

View File

@ -24,7 +24,7 @@ src_configure() {
}
src_compile() {
make PREFIX="${PREFIX}" CROSS_COMPILE= CFLAGS="-DSYSCALL_NO_TLS" AS_CMD='as -o $@ $<'
make "${MAKEJOBS}" PREFIX="${PREFIX}" CROSS_COMPILE= CFLAGS="-DSYSCALL_NO_TLS" AS_CMD='as -o $@ $<'
}
src_install() {

View File

@ -27,5 +27,5 @@ src_configure() {
}
src_compile() {
make CROSS_COMPILE= AR="tcc -ar" RANLIB=true CFLAGS="-DSYSCALL_NO_TLS"
make "${MAKEJOBS}" CROSS_COMPILE= AR="tcc -ar" RANLIB=true CFLAGS="-DSYSCALL_NO_TLS"
}

View File

@ -29,5 +29,5 @@ src_configure() {
}
src_compile() {
make CROSS_COMPILE=
make "${MAKEJOBS}" CROSS_COMPILE=
}

View File

@ -34,6 +34,10 @@ src_prepare() {
sed -i "s#/usr/include/errno.h#${PREFIX}/include/musl/bits/errno.h#" ext/Errno/Errno_pm.PL
}
src_compile() {
make -j1 PREFIX="${PREFIX}"
}
src_install() {
# Remove old perl
rm -rf "${PREFIX}"/lib/perl5/

View File

@ -21,6 +21,13 @@ SRCDIR="${srcdir}"
# shellcheck source=sysa/helpers.sh
. helpers.sh
if [ "${KERNEL_BOOTSTRAP}" ]; then
# Fiwix does not support SMP
MAKEJOBS="-j1"
else
MAKEJOBS="-j${JOBS}"
fi
# Ask some questions
echo
echo "Now that bash has been built, there are potentially some questions for you!"
@ -178,6 +185,7 @@ SOURCES=${SOURCES}
DESTDIR=${DESTDIR}
DISTFILES=${DISTFILES}
SRCDIR=${SRCDIR}
MAKEJOBS=${MAKEJOBS}
EOF
exec env -i bash run2.sh

View File

@ -8,6 +8,10 @@ src_prepare() {
touch config.h
}
src_compile() {
make -j1 PREFIX="${PREFIX}"
}
src_install() {
default
}

View File

@ -15,7 +15,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -11,7 +11,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true DESTDIR="${DESTDIR}"
make "${MAKEJOBS}" MAKEINFO=true DESTDIR="${DESTDIR}"
}
src_install() {

View File

@ -47,7 +47,7 @@ src_compile() {
--disable-shared \
--enable-timeout=15
touch doc/agdoc.texi # build later
make CFLAGS=-Wno-error
make -j1 CFLAGS=-Wno-error
# Fix non-reproducible man-page
awk '{gsub("\\(/tmp/.*", "", $7); print}' agen5/autogen.1 > autogen.1

View File

@ -15,7 +15,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -47,6 +47,10 @@ src_configure() {
bash_cv_dev_fd=whacky
}
src_compile() {
make -j1 PREFIX="${PREFIX}"
}
src_install() {
install -D bash "${DESTDIR}${PREFIX}/bin/bash"
# Work around weird symlink bug

View File

@ -89,7 +89,7 @@ src_configure() {
src_compile() {
make -C bfd headers
for dir in libiberty bfd opcodes libctf binutils gas gprof ld; do
make -C $dir tooldir=${PREFIX} CFLAGS="-std=c99"
make "${MAKEJOBS}" -C $dir tooldir=${PREFIX} CFLAGS="-std=c99"
done
}

View File

@ -26,7 +26,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make -j1 MAKEINFO=true
}
src_install() {

View File

@ -27,7 +27,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make -j1 MAKEINFO=true
}
src_install() {

View File

@ -42,7 +42,7 @@ src_configure() {
}
src_compile() {
make PREFIX="${PREFIX}" MAKEINFO="true"
make "${MAKEJOBS}" PREFIX="${PREFIX}" MAKEINFO="true"
}
src_install() {

View File

@ -22,7 +22,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -11,6 +11,6 @@ src_configure() {
./configure \
--prefix="${PREFIX}" \
--libdir="${LIBDIR}" \
--disable-shared \
--disable-shared \
CFLAGS='-D_GNU_SOURCE -DNO_GETCONTEXT -DSEARCH_FOR_DATA_START -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR'
}

View File

@ -125,15 +125,15 @@ src_compile() {
ln -s . build/build-i386-unknown-linux-musl
for dir in libiberty libcpp libdecnumber gcc; do
# We have makeinfo now but it is not happy with gcc .info files, so skip it
make -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" \
make "${MAKEJOBS}" -C build/$dir LIBGCC2_INCLUDES=-I"${PREFIX}/include" \
STMP_FIXINC= GMPLIBS="-lmpc -lmpfr -lgmp" MAKEINFO=true
done
# host_subdir is necessary because we have slightly different build directory layout
make -C build/libgcc PATH="${PATH}:../gcc" CC=../gcc/xgcc \
make "${MAKEJOBS}" -C build/libgcc PATH="${PATH}:../gcc" CC=../gcc/xgcc \
host_subdir=build CFLAGS="-I../gcc/include -I/${PREFIX}/include"
make -C build/libstdc++-v3 PATH="${PATH}:${PWD}/build/gcc" \
make "${MAKEJOBS}" -C build/libstdc++-v3 PATH="${PATH}:${PWD}/build/gcc" \
CXXFLAGS="-I${PWD}/build/gcc/include -I ${PREFIX}/include"
}

View File

@ -21,7 +21,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true CFLAGS="-I${PWD}/libtextstyle/lib"
make "${MAKEJOBS}" MAKEINFO=true CFLAGS="-I${PWD}/libtextstyle/lib"
}
src_install() {

View File

@ -23,7 +23,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true DESTDIR="${DESTDIR}"
make "${MAKEJOBS}" MAKEINFO=true DESTDIR="${DESTDIR}"
}
src_install() {

View File

@ -4,17 +4,30 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
src_prepare() {
default
# guile-psyntax-bootstrapping only supports Guile 3.0.7
# We need Guile 3.0.8 or later in order to have reproducible builds when
# parallelism (-jX) is enabled.
#
# To work around this issue, we;
# 1. run guile-psyntax-bootstrapping on Guile 3.0.7
# 2. take psyntax-pp.scm from Guile 3.0.7 and transplant into 3.0.9
# 3. compile guile 3.0.9
common_prepare() {
find . -name '*.info*' -delete
../../import-gnulib.sh
rm -r prebuilt/*/ice-9
# Remove buildstamp
sed -i "s/\`date -u +'%Y-%m-%d %T'.*\`/1970-01-01 00:00:00/" libguile/Makefile.am
autoreconf-2.71 -fi
}
src_prepare() {
# First, prepare Guile 3.0.7
cd ../guile-3.0.7
../../import-gnulib-3.0.7.sh
common_prepare
# pp-syntax bootstrap: remove pre-gen file
sha256sum module/ice-9/psyntax-pp.scm | tee psyntax-pp.sha256
@ -28,19 +41,30 @@ src_prepare() {
cp psyntax.scm psyntax-patched.scm
patch <../../../guile-psyntax-bootstrapping-guile-3.0.7/stage2.patch
cd ../..
# Now, Guile 3.0.9
cd ../guile-3.0.9
default
../../import-gnulib.sh
common_prepare
}
src_configure() {
PKG_CONFIG_PATH="${LIBDIR}/pkgconfig" ./configure \
--prefix="${PREFIX}" \
--libdir="${LIBDIR}" \
--build=i386-unknown-linux-musl \
--disable-shared \
--disable-jit
for d in . ../guile-3.0.7; do
pushd "${d}"
PKG_CONFIG_PATH="${LIBDIR}/pkgconfig" ./configure \
--prefix="${PREFIX}" \
--libdir="${LIBDIR}" \
--build=i386-unknown-linux-musl \
--disable-shared \
--disable-jit
popd
done
}
src_compile() {
# pp-syntax: rebuild
pushd ../guile-3.0.7
make config.h
make libguile/scmconfig.h
make .version
@ -56,6 +80,10 @@ src_compile() {
# Note that on 32-bit systems psyntax-pp is not identical to the original
# and some identifier names are different.
popd
# Transplant psyntax-pp.scm
cp -f ../guile-3.0.7/module/ice-9/psyntax-pp.scm module/ice-9/
# Now proceed with the build
default

129
sysc/guile-3.0.9/import-gnulib.sh Executable file
View File

@ -0,0 +1,129 @@
#!/bin/sh
# SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
#
# SPDX-License-Identifier: GPL-3.0-or-later
../gnulib-356a414e/gnulib-tool --import --local-dir=gnulib-local \
--lib=libgnu \
--source-base=lib \
--m4-base=m4 \
--doc-base=doc \
--tests-base=tests \
--aux-dir=build-aux \
--lgpl=3 \
--conditional-dependencies \
--libtool \
--macro-prefix=gl \
--no-vc-files \
--avoid=lock \
--avoid=unistr/base \
--avoid=unistr/u8-mbtouc \
--avoid=unistr/u8-mbtouc-unsafe \
--avoid=unistr/u8-mbtoucr \
--avoid=unistr/u8-prev \
--avoid=unistr/u8-uctomb \
--avoid=unitypes \
accept4 \
alignof \
alloca-opt \
announce-gen \
autobuild \
bind \
byteswap \
c-strcase \
canonicalize-lgpl \
ceil \
clock-time \
close \
connect \
copysign \
dirfd \
dirname-lgpl \
duplocale \
environ \
extensions \
flexmember \
flock \
floor \
fpieee \
frexp \
fstat \
fsync \
full-read \
full-write \
func \
gendocs \
getaddrinfo \
gethostname \
getlogin \
getpeername \
getsockname \
getsockopt \
git-version-gen \
gitlog-to-changelog \
gnu-web-doc-update \
gnupload \
havelib \
iconv_open-utf \
inet_ntop \
inet_pton \
isfinite \
isinf \
isnan \
ldexp \
lib-symbol-versions \
lib-symbol-visibility \
libunistring \
link \
listen \
localcharset \
locale \
log1p \
lstat \
maintainer-makefile \
malloc-gnu \
malloca \
mkdir \
mkostemp \
nl_langinfo \
nproc \
nstrftime \
open \
pipe-posix \
pipe2 \
poll \
posix_spawn \
posix_spawn_file_actions_addclose \
posix_spawn_file_actions_adddup2 \
posix_spawn_file_actions_addopen \
posix_spawn_file_actions_init \
posix_spawnp \
putenv \
readlink \
recv \
recvfrom \
regex \
rename \
rmdir \
select \
send \
sendto \
setenv \
setsockopt \
shutdown \
socket \
stat-time \
stdlib \
striconveh \
string \
sys_select \
sys_stat \
time \
times \
trunc \
unistd \
verify \
vsnprintf \
warnings \
wchar

View File

@ -1,3 +1,5 @@
https://mirrors.kernel.org/gnu/guile/guile-3.0.7.tar.xz f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7
https://mirrors.kernel.org/gnu/guile/guile-3.0.9.tar.xz 1a2625ac72b2366e95792f3fe758fd2df775b4044a90a4a9787326e66c0d750d
https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-901694b9.tar.gz f9aad85de1f41d57c9368d304020ffbf354a5e56db1297f022c3d12181134e56
https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-356a414e.tar.gz fc9973f1a9243fdc4b98d33d7704f3c71bfdc4c2ef96899b8f28cade7290a714
https://github.com/schierlm/guile-psyntax-bootstrapping/archive/refs/tags/guile-3.0.7.tar.gz 14cda9c416506dfadf60c14fc623ff01ef99b87564a78d0a29c5d17143c97609

View File

@ -21,6 +21,8 @@ export SOURCE_DATE_EPOCH=0
# shellcheck source=sysa/helpers.sh
. "${SOURCES}/helpers.sh"
MAKEJOBS="-j${JOBS}"
echo
echo "Installing packages into sysc"
@ -75,6 +77,7 @@ SOURCES=${SOURCES}
DESTDIR=${DESTDIR}
DISTFILES=${DISTFILES}
SRCDIR=${SRCDIR}
MAKEJOBS=${MAKEJOBS}
EOF
exec ./run.sh

View File

@ -14,7 +14,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -35,7 +35,7 @@ src_configure() {
}
src_compile() {
make AUTOM4TE=autom4te-2.69 MAKEINFO=true
make "${MAKEJOBS}" AUTOM4TE=autom4te-2.69 MAKEINFO=true
}
src_install() {

View File

@ -21,7 +21,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO="true"
make "${MAKEJOBS}" MAKEINFO="true"
}
src_install() {

View File

@ -17,7 +17,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true DESTDIR="${DESTDIR}"
make "${MAKEJOBS}" MAKEINFO=true DESTDIR="${DESTDIR}"
}
src_install() {

View File

@ -20,7 +20,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true DESTDIR="${DESTDIR}"
make "${MAKEJOBS}" MAKEINFO=true DESTDIR="${DESTDIR}"
}
src_install() {

View File

@ -13,7 +13,7 @@ src_configure() {
}
src_compile() {
make CROSS_COMPILE=
make "${MAKEJOBS}" CROSS_COMPILE=
}
src_install() {

View File

@ -16,7 +16,7 @@ src_configure() {
}
src_compile() {
make MAKEINFO=true
make "${MAKEJOBS}" MAKEINFO=true
}
src_install() {

View File

@ -36,11 +36,11 @@ src_configure() {
src_compile() {
# Build pgen
pushd Parser
make pgen
make -j1 pgen
popd
# Regen graminit.c and graminit.h
pushd Grammar
make graminit.c
make -j1 graminit.c
popd
# Regenerate some Python scripts using the other regenerated files
@ -56,7 +56,7 @@ src_compile() {
mv Lib/token.py.new Lib/token.py
# Now build the main program
make
make -j1
}
src_install() {

View File

@ -35,11 +35,11 @@ src_configure() {
src_compile() {
# Build pgen
pushd Parser
make pgen
make -j1 pgen
popd
# Regen graminit.c and graminit.h
pushd Grammar
make graminit.c
make -j1 graminit.c
popd
# Regenerate some Python scripts using the other regenerated files
@ -55,7 +55,7 @@ src_compile() {
mv Lib/token.py.new Lib/token.py
# Now build the main program
make
make -j1
}
src_install() {

View File

@ -46,9 +46,9 @@ src_configure() {
src_compile() {
# Build pgen
make Parser/pgen
make "${MAKEJOBS}" Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -59,7 +59,7 @@ src_compile() {
python token.py
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -47,9 +47,9 @@ src_configure() {
src_compile() {
# Build pgen
make Parser/pgen
make "${MAKEJOBS}" Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -60,7 +60,7 @@ src_compile() {
python token.py
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -58,9 +58,9 @@ src_compile() {
# Temporarily break include cycle
patch -Np0 -i graminit-regen.patch
# Build pgen
make Parser/pgen
make "${MAKEJOBS}" Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -73,7 +73,7 @@ src_compile() {
# Undo change
patch -Np0 -R -i graminit-regen.patch
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -52,9 +52,9 @@ src_compile() {
# Temporarily break include cycle
patch -Np0 -i graminit-regen.patch
# Build pgen
make Parser/pgen
make "${MAKEJOBS}" Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -67,7 +67,7 @@ src_compile() {
# Undo change
patch -Np0 -R -i graminit-regen.patch
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -57,9 +57,9 @@ src_compile() {
# Temporarily break include cycle
patch -Np0 -i graminit-regen.patch
# Build pgen
make Parser/pgen
make "${MAKEJOBS}" Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -72,7 +72,7 @@ src_compile() {
# Undo change
patch -Np0 -R -i graminit-regen.patch
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -69,7 +69,7 @@ src_compile() {
# We have to choose the order ourselves because the Makefile is extremely lax about the order
# First of all, do everything that doesn't use any C
rm Modules/_blake2/blake2s_impl.c
make regen-opcode \
make "${MAKEJOBS}" regen-opcode \
regen-opcode-targets \
regen-typeslots \
regen-token \
@ -82,17 +82,17 @@ src_compile() {
regen-global-objects
# Do the freeze regen process
make regen-frozen
make regen-deepfreeze
make regen-global-objects
make "${MAKEJOBS}" regen-frozen
make "${MAKEJOBS}" regen-deepfreeze
make "${MAKEJOBS}" regen-global-objects
make CPPFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CPPFLAGS="-U__DATE__ -U__TIME__"
# Regen Python/stdlib_module_names.h (you must have an existing build first)
make regen-stdlib-module-names
make "${MAKEJOBS}" regen-stdlib-module-names
# Now rebuild with proper stdlib_module_names.h
make CPPFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CPPFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -55,9 +55,9 @@ src_configure() {
src_compile() {
# Build pgen
make Parser/pgen
make "${MAKEJOBS}" Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -69,7 +69,7 @@ src_compile() {
python token.py
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make -j1 CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -58,9 +58,9 @@ src_configure() {
src_compile() {
# Build pgen
make Parser/pgen
make -j1 Parser/pgen
# Regen graminit.c and graminit.h
make Include/graminit.h
make "${MAKEJOBS}" Include/graminit.h
# Regenerate some Python scripts using the other regenerated files
# Must move them out to avoid using Lib/ module files which are
@ -72,7 +72,7 @@ src_compile() {
python token.py
# Now build the main program
make CFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -53,9 +53,9 @@ src_configure() {
src_compile() {
# Regenerations
rm Modules/_blake2/blake2s_impl.c
make regen-all
make "${MAKEJOBS}" regen-all
make CPPFLAGS="-U__DATE__ -U__TIME__"
make "${MAKEJOBS}" CPPFLAGS="-U__DATE__ -U__TIME__"
}
src_install() {

View File

@ -86,7 +86,7 @@ build libatomic_ops-7.6.10
build gc-8.0.4
build guile-3.0.7
build guile-3.0.9
build which-2.21

View File

@ -27,7 +27,7 @@ src_configure() {
}
src_compile() {
make PREFIX="${PREFIX}" MAKEINFO="true"
make "${MAKEJOBS}" PREFIX="${PREFIX}" MAKEINFO="true"
}
src_install() {