summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrufo2021-09-04 18:17:05 +0100
committergrufo2021-09-04 18:17:05 +0100
commit7897c7a40422351a0032fb862ba1659a246e991e (patch)
tree2f08673ce22616d4245b14d080f918ab1c4346e0
parent72a85c644f0c07fcfd21ceb1b479c35c1d35b49b (diff)
downloadaur-7897c7a40422351a0032fb862ba1659a246e991e.tar.gz
Revert back from `make -j"$(nproc || echo -n 1)"` to simply `make`; remove `!makeflags` from `$options` array
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD15
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a1b81a6ab7b7..ef85c8895091 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -45,7 +45,6 @@ pkgbase = gnunet
optdepends = texi2mdoc: for automatic mdoc generation
conflicts = gnunet-git
conflicts = gnunet-bin
- options = !makeflags
backup = etc/gnunet.conf
source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.15.3.tar.gz
source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.15.3.tar.gz.sig
diff --git a/PKGBUILD b/PKGBUILD
index 7e1fd816fe02..5e1b15462d17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,6 @@ optdepends=('postgresql: for an alternative to sqlite in the database plugin'
'libpabc: for re:claimID zero-knowledge privacy credentials'
'texi2mdoc: for automatic mdoc generation')
backup=("etc/${pkgname}.conf")
-options=('!makeflags')
source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
"${pkgname}-system.service"
"${pkgname}-user.service"
@@ -57,7 +56,7 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix='/usr' --enable-experimental
- make -j"$(nproc || echo -n 1)"
+ make
make -C contrib
}
@@ -70,16 +69,20 @@ package() {
make DESTDIR="${pkgdir}" -C contrib install
install -dm755 "${pkgdir}/usr/lib/systemd/system"
- install -Dm644 "${srcdir}/${pkgname}-system.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+ install -Dm644 "${srcdir}/${pkgname}-system.service" \
+ "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
install -dm755 "${pkgdir}/usr/lib/systemd/user"
- install -Dm644 "${srcdir}/${pkgname}-user.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
+ install -Dm644 "${srcdir}/${pkgname}-user.service" \
+ "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
install -dm755 "${pkgdir}/usr/lib/sysusers.d"
- install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+ install -Dm644 "${srcdir}/${pkgname}.sysusers" \
+ "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
install -dm755 "${pkgdir}/usr/lib/tmpfiles.d"
- install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+ install -Dm644 "${srcdir}/${pkgname}.tmpfiles" \
+ "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
# Automatically generate a configuration file using the content of
# `/usr/share/gnunet/config.d/` as model; in this way we can ensure