diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml index f40caf7..81962eb 100644 --- a/.gitea/workflows/build-arch-builder.yaml +++ b/.gitea/workflows/build-arch-builder.yaml @@ -7,7 +7,7 @@ on: - '.gitea/workflows/build-arch-builder.yaml' jobs: "Build arch-builder docker images": - runs-on: woryzen + runs-on: hostinger steps: - name: Set up Docker Buildx diff --git a/arch-builder/makepkg/makepkg-aarch64.conf b/arch-builder/makepkg/makepkg-aarch64.conf index f938ff8..e5ea7ee 100644 --- a/arch-builder/makepkg/makepkg-aarch64.conf +++ b/arch-builder/makepkg/makepkg-aarch64.conf @@ -47,7 +47,7 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" LTOFLAGS="-flto=auto" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j16" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-armv7h.conf b/arch-builder/makepkg/makepkg-armv7h.conf index 76c0e9a..382ea20 100644 --- a/arch-builder/makepkg/makepkg-armv7h.conf +++ b/arch-builder/makepkg/makepkg-armv7h.conf @@ -44,7 +44,7 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" LTOFLAGS="-flto=auto" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j16" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-goldmont.conf b/arch-builder/makepkg/makepkg-goldmont.conf index 46c5bc4..cd4ade1 100644 --- a/arch-builder/makepkg/makepkg-goldmont.conf +++ b/arch-builder/makepkg/makepkg-goldmont.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-native.conf b/arch-builder/makepkg/makepkg-native.conf index d7c68b7..010ba6d 100644 --- a/arch-builder/makepkg/makepkg-native.conf +++ b/arch-builder/makepkg/makepkg-native.conf @@ -41,7 +41,7 @@ CFLAGS="-march=native -mtune=native -O3 -pipe -fstack-protector-strong" CXXFLAGS="-march=native -mtune=native -O3 -pipe -fstack-protector-strong" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-sandybridge.conf b/arch-builder/makepkg/makepkg-sandybridge.conf index 796f80a..44ce3c0 100644 --- a/arch-builder/makepkg/makepkg-sandybridge.conf +++ b/arch-builder/makepkg/makepkg-sandybridge.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-silvermont.conf b/arch-builder/makepkg/makepkg-silvermont.conf index 2569b8a..547d09b 100644 --- a/arch-builder/makepkg/makepkg-silvermont.conf +++ b/arch-builder/makepkg/makepkg-silvermont.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-skylake.conf b/arch-builder/makepkg/makepkg-skylake.conf index 50fa3f6..c709e0d 100644 --- a/arch-builder/makepkg/makepkg-skylake.conf +++ b/arch-builder/makepkg/makepkg-skylake.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-tigerlake.conf b/arch-builder/makepkg/makepkg-tigerlake.conf index ec47bbf..0dd41b8 100644 --- a/arch-builder/makepkg/makepkg-tigerlake.conf +++ b/arch-builder/makepkg/makepkg-tigerlake.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-znver1.conf b/arch-builder/makepkg/makepkg-znver1.conf index 5957ce4..e138be4 100644 --- a/arch-builder/makepkg/makepkg-znver1.conf +++ b/arch-builder/makepkg/makepkg-znver1.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-znver2.conf b/arch-builder/makepkg/makepkg-znver2.conf index 98e6f2a..1bac950 100644 --- a/arch-builder/makepkg/makepkg-znver2.conf +++ b/arch-builder/makepkg/makepkg-znver2.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-znver3.conf b/arch-builder/makepkg/makepkg-znver3.conf index b7fc508..c11e638 100644 --- a/arch-builder/makepkg/makepkg-znver3.conf +++ b/arch-builder/makepkg/makepkg-znver3.conf @@ -45,7 +45,7 @@ CXXFLAGS="$CFLAGS" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" #RUSTFLAGS="-C opt-level=2" #-- Make Flags: change this for DistCC/SMP systems -MAKEFLAGS="-j32" +MAKEFLAGS="-j4" #-- Debugging flags DEBUG_CFLAGS="-g -fvar-tracking-assignments" DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" diff --git a/arch-builder/makepkg/makepkg-znver5.conf b/arch-builder/makepkg/makepkg-znver5.conf new file mode 100644 index 0000000..fd5b485 --- /dev/null +++ b/arch-builder/makepkg/makepkg-znver5.conf @@ -0,0 +1,150 @@ +#!/hint/bash +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' + 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/wget + +#-- The package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="x86_64" +CHOST="x86_64-pc-linux-gnu" + +#-- Compiler and Linker Flags +#CPPFLAGS="" +CFLAGS="-march=znver5 -mtune=znver5 -O3 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \ + -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection" +CXXFLAGS="$CFLAGS" +LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" +#RUSTFLAGS="-C opt-level=2" +#-- Make Flags: change this for DistCC/SMP systems +MAKEFLAGS="-j4" +#-- Debugging flags +DEBUG_CFLAGS="-g -fvar-tracking-assignments" +DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" +#DEBUG_RUSTFLAGS="-C debuginfo=2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Defaults: BUILDENV=(!distcc !color !ccache check !sign) +# A negated environment option will do the opposite of the comments below. +# +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +#-- sign: Generate PGP signature file +# +BUILDENV=(!distcc color ccache check !sign) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" +# +#-- Specify a directory for package building. +#BUILDDIR=/tmp/makepkg + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug) + +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 +INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) +#-- Directory to store source code in for debug packages +DBGSRCDIR="/usr/src/debug" + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Log files: specify a fixed directory where all log files will be placed +#LOGDEST=/home/makepkglogs +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe " +#-- Specify a key to use for package signing +#GPGKEY="" + +######################################################################### +# COMPRESSION DEFAULTS +######################################################################### +# +COMPRESSGZ=(gzip -c -f -n) +COMPRESSBZ2=(bzip2 -c -f) +COMPRESSXZ=(xz -c -z -) +COMPRESSZST=(zstd -c -z -q -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) +COMPRESSZ=(compress -c -f) +COMPRESSLZ4=(lz4 -q) +COMPRESSLZ=(lzip -c -f) + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +PKGEXT='.pkg.tar.lzo' +SRCEXT='.src.tar.gz'