diff --git a/PKGBUILD b/PKGBUILD index a94e6d3f4..f218bcfca 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,15 +4,14 @@ pkgbase=pacman pkgname=(libalpm pacman repo-tools) -pkgver=7.0.0 -pkgrel=14 +pkgver=7.1.0 +pkgrel=1 arch=(x86_64 aarch64 riscv64 loongarch64) url=https://www.archlinux.org/pacman/ license=(GPL) makedepends=(meson libarchive openssl ninja acl curl xz gpgme) # TODO: asciidoc doxygen checkdepends=(python) source=(https://gitlab.archlinux.org/pacman/pacman/-/archive/v$pkgver/pacman-v$pkgver.tar.gz - fix-typo.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/c3aa1bc12367a8c29ddac310d8bb86ae10719bd2.patch 0001-rust-ltoflags.patch # new feature, to be upstreamed pacman.conf makepkg.conf @@ -23,11 +22,10 @@ source=(https://gitlab.archlinux.org/pacman/pacman/-/archive/v$pkgver/pacman-v$p function_license.sh script_warndirs.sh script_noglibc.sh) -sha256sums=('ef08f258cb3e0885c5884ad43fb6cff0e9c327ed33024d79d03555f99c583744' - '553c3547b524f0169e7edfad508226037582c882b97f2660942513545dc7a8cf' +sha256sums=('1090f680958a73dc1f443a1eb919bd2ad77b3caff38e92e9737dec100c647bc9' 'de0902f0e3a4607bfcbac2df8ab0707f63f0b39ea3f0ec7c306f2af1fff447b5' '0865036ef04a06b00926640ac7db2275988b834f435101e8110eedf8a2e58b88' - 'c7963770edff710ddd87246269a0edbf44b4a4a906ffae7d025546fff3f61ef0' + 'a2c787c7e56d6ae79259e7d99433ee50bde6a6afbc2dafcb8c2c9584ba1d660c' '738432ead6dae6c63a5cbd33e110f8a5e34f5143d125e183cf77dc3dbe87fe92' '9b1e4d7076137fb8ebb609068403024dc66d6d3c3b53b718401d4c79c8437d8f' '7d2ad28bef8f9f77f33929d2050244a6f29941de6ad0793b6820caee3dbd84e3' diff --git a/makepkg.conf b/makepkg.conf index 00213b806..18cee7816 100644 --- a/makepkg.conf +++ b/makepkg.conf @@ -15,6 +15,7 @@ RUSTARCH="@@BUILD_GEN_RUSTARCH@@" RUSTHOST="${RUSTARCH}-unknown-linux-musl" JOBS="$(nproc)" +NPROC="$JOBS" CFLAGS="@@BUILD_GEN_CFLAGS@@" CXXFLAGS="$CFLAGS" MAKEFLAGS="CC=cc CXX=c++ LIBTOOL=slibtool LIBTOOLIZE=slibtoolize -j$JOBS" @@ -30,7 +31,7 @@ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readon BUILDENV=(!distcc color !ccache check !sign) -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug @@BUILD_GEN_LTO@@ !autodeps) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug @@BUILD_GEN_LTO@@ !autodeps) INTEGRITY_CHECK=(sha256) STRIP_BINARIES="--strip-all"