summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2020-05-28 20:29:18 -0700
committerMike Swanson2020-05-28 20:29:18 -0700
commit8475e6ea1fbb4a39f707f723a267d0bcc05043d9 (patch)
tree5c673e297c5d7587f26045ea82e638f048fc803c
parenta83262313ebd563bb5cfa5acb7b8a23855bc944b (diff)
downloadaur-8475e6ea1fbb4a39f707f723a267d0bcc05043d9.tar.gz
Update to 4.10, force non-parallel ‘make’
parallel make has a race condition, the repository-editing.adoc file has an includes from options.adoc, which can only be generated with the reposurgeon binary.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
2 files changed, 8 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d27189532124..c2ee956b95ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = reposurgeon
pkgdesc = Performs surgery on version control repositories.
- pkgver = 4.9
+ pkgver = 4.10
pkgrel = 1
url = http://www.catb.org/esr/reposurgeon/
arch = x86_64
@@ -18,8 +18,8 @@ pkgbase = reposurgeon
optdepends = mercurial
optdepends = src
optdepends = subversion
- source = https://gitlab.com/esr/reposurgeon/-/archive/4.9/reposurgeon-4.9.tar.gz
- b2sums = d47a2ef39686a927e039e947df14c02806f83a02cd469d9ab08f9e9b1974134ceda7171dd23b15507aed100777ea6b866b248735f26fcfc0d05b54925218bb80
+ source = https://gitlab.com/esr/reposurgeon/-/archive/4.10/reposurgeon-4.10.tar.gz
+ b2sums = fd75132caf755e05d8af2ccdf326315f0dfc25dd8711c0f84f06a0cab835887db468868a51f2fd8d579371804924f06ceff248ed335bfb61dd4f06b2221c4ce5
pkgname = reposurgeon
diff --git a/PKGBUILD b/PKGBUILD
index d3801d452a54..578e6bf7d1e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
pkgname=reposurgeon
-pkgver=4.9
+pkgver=4.10
pkgrel=1
pkgdesc="Performs surgery on version control repositories."
arch=('x86_64')
@@ -18,7 +18,7 @@ optdepends=('bitkeeper'
'src'
'subversion')
source=("https://gitlab.com/esr/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz")
-b2sums=('d47a2ef39686a927e039e947df14c02806f83a02cd469d9ab08f9e9b1974134ceda7171dd23b15507aed100777ea6b866b248735f26fcfc0d05b54925218bb80')
+b2sums=('fd75132caf755e05d8af2ccdf326315f0dfc25dd8711c0f84f06a0cab835887db468868a51f2fd8d579371804924f06ceff248ed335bfb61dd4f06b2221c4ce5')
prepare() {
cd "$pkgbase-$pkgver"
@@ -35,10 +35,11 @@ prepare() {
build() {
cd "$pkgbase-$pkgver"
+ # Use -j1 so reposurgeon always gets built before options.adoc is needed
if [ "$(go version | grep gccgo)" ]; then
- make GOFLAGS=""
+ make GOFLAGS="" -j1
else
- make
+ make -j1
fi
}