1915a138c0
Same as #4584 but with an additional backport: https://github.com/msys2/msys2-pacman/pull/49 Old message: See msys2/msys2-pacman#45 makepkg.conf synced with the upstream version: https://gitlab.archlinux.org/pacman/pacman/-/blob/v6.1.0/etc/makepkg.conf.in Skip patches only changing CI configs
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
From 16ee7ffdfa339a6edeb98c549f80ee609474cc21 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Sat, 10 Sep 2022 11:39:35 +0200
|
|
Subject: [PATCH 24/N] Make lint_pkgbuild opt-in via MAKEPKG_LINT_PKGBUILD=1
|
|
|
|
Cygwin bash is struggling with the thousands of commands that get invoked
|
|
when lint_pkgbuild is run. This especially is annoying for split packages
|
|
because the calls get multiplied by the package count.
|
|
|
|
For example when running --printsrcinfo:
|
|
|
|
msys/brotli (4 packages)
|
|
* 39.8 seconds with linting
|
|
* 7 seconds without
|
|
|
|
msys/tar (1 package)
|
|
* 10.2 seconds with linting
|
|
* 2 seconds without
|
|
|
|
This changes the default to not lint the PKGBUILD and adds a
|
|
MAKEPKG_LINT_PKGBUILD env var that can be used to enable linting.
|
|
We can for example enable this in CI.
|
|
---
|
|
scripts/makepkg.sh.in | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
|
|
index 7e30bc2..2e2c3b6 100644
|
|
--- a/scripts/makepkg.sh.in
|
|
+++ b/scripts/makepkg.sh.in
|
|
@@ -1127,8 +1127,11 @@ fi
|
|
|
|
pkgbase=${pkgbase:-${pkgname[0]}}
|
|
|
|
-# check the PKGBUILD for some basic requirements
|
|
-lint_pkgbuild || exit $E_PKGBUILD_ERROR
|
|
+# MSYS2: lint_pkgbuild is very slow with cygwin bash, so make it opt-in
|
|
+if (( MAKEPKG_LINT_PKGBUILD )); then
|
|
+ # check the PKGBUILD for some basic requirements
|
|
+ lint_pkgbuild || exit $E_PKGBUILD_ERROR
|
|
+fi
|
|
|
|
if (( !SOURCEONLY && !PRINTSRCINFO )); then
|
|
merge_arch_attrs
|