From cadcbd2f6d468bbc7377128daa8b4d9bf142c25f Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Sat, 25 Feb 2023 11:47:34 -0800 Subject: [PATCH] Make jigdo work again! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable Arch’s default buildflags and makeflags, and use db4.8. Should be fine. --- .SRCINFO | 6 ++++-- PKGBUILD | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dcce9ce..9d532ea 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,17 @@ pkgbase = jigdo pkgdesc = Distribute large images by sending and receiving the files that make them up pkgver = 0.8.1 - pkgrel = 1 + pkgrel = 2 url = https://www.einval.com/~steve/software/jigdo/ arch = x86_64 license = GPL2 makedepends = docbook-utils makedepends = docbook-sgml makedepends = perl-sgmls - depends = db + depends = db4.8 depends = wget + options = !buildflags + options = !makeflags source = https://www.einval.com/~steve/software/jigdo/download/jigdo-0.8.1.tar.xz b2sums = 6619017716066d1ccea4812fcfd980be670979c086a42005fd585e78c761f2db2e4ede461ecedae8d60d04a60a348ce214fd64975b1712307972b56b1f899fae diff --git a/PKGBUILD b/PKGBUILD index 4aa5ad9..00806dd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,15 +2,16 @@ pkgname=jigdo pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Distribute large images by sending and receiving the files that make them up" arch=('x86_64') url="https://www.einval.com/~steve/software/jigdo/" license=('GPL2') -depends=('db' 'wget') +depends=('db4.8' 'wget') makedepends=('docbook-utils' 'docbook-sgml' 'perl-sgmls') source=("${url}download/jigdo-${pkgver}.tar.xz") b2sums=('6619017716066d1ccea4812fcfd980be670979c086a42005fd585e78c761f2db2e4ede461ecedae8d60d04a60a348ce214fd64975b1712307972b56b1f899fae') +options=(!buildflags !makeflags) prepare() { cd "$pkgname-$pkgver" @@ -27,11 +28,11 @@ prepare() { build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr --without-gui --enable-nls + CPPFLAGS=-I/usr/include/db4.8 ./configure --prefix=/usr --without-gui --enable-nls # The compilation is stupid... seems to work just forcing it a few times - make -j1 || true - make -j1 || true + make || true + make || true make }