diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-08-31 23:08:05 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-08-31 23:08:05 +0200 |
| commit | 95fcd95966feaefa5d0df6f1bd390e2f8760597f (patch) | |
| tree | 16627b676700b2e38987c3c9dd0678213f0e6615 | |
| parent | 449fac1a4b928ef4052b8ed4a23cb88dc3969de0 (diff) | |
testing/tpm2-tools: build without manpages, need pandoc
And pandoc is only available on x86_64
| -rw-r--r-- | testing/tpm2-tools/APKBUILD | 19 | ||||
| -rw-r--r-- | testing/tpm2-tools/dont-generate-manpages-without-pandoc.patch | 18 |
2 files changed, 32 insertions, 5 deletions
diff --git a/testing/tpm2-tools/APKBUILD b/testing/tpm2-tools/APKBUILD index 1e2600ea56e..d2256174e74 100644 --- a/testing/tpm2-tools/APKBUILD +++ b/testing/tpm2-tools/APKBUILD @@ -2,16 +2,24 @@ # Maintainer: Alexander Sack <asac@pantacor.com> pkgname=tpm2-tools pkgver=4.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="TPM2 Tools" url="https://github.com/tpm2-software/tpm2-tools/" arch="all" license="BSD-2-Clause" -makedepends="tpm2-tss-dev openssl-dev curl-dev util-linux-dev pandoc" -subpackages="$pkgname-doc $pkgname-bash-completion" -source="https://github.com/tpm2-software/tpm2-tools/releases/download/$pkgver/tpm2-tools-$pkgver.tar.gz" +makedepends="tpm2-tss-dev openssl-dev curl-dev util-linux-dev libtool + autoconf automake" +subpackages="$pkgname-bash-completion" +source="https://github.com/tpm2-software/tpm2-tools/releases/download/$pkgver/tpm2-tools-$pkgver.tar.gz + dont-generate-manpages-without-pandoc.patch" options="!check" +prepare() { + default_prepare + + autoreconf -fi +} + build() { ./configure \ --build=$CBUILD \ @@ -24,4 +32,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="983ad12621a74255e3cde14110aba56e3f65fb80e0e31ea007a6919f2d447cd7cf06292f4162d1b38d22916292efc893d4d45bd0004d43f638be744505fdcd36 tpm2-tools-4.3.0.tar.gz" +sha512sums="983ad12621a74255e3cde14110aba56e3f65fb80e0e31ea007a6919f2d447cd7cf06292f4162d1b38d22916292efc893d4d45bd0004d43f638be744505fdcd36 tpm2-tools-4.3.0.tar.gz +2e0862c3c5d07cd40f655fa762a881a243fcf63c966f9867032057f7d7373fea94785929d8ef8bba8961bafa7d4549ebb3b90a09b15d6cfd8d3f08acfd488364 dont-generate-manpages-without-pandoc.patch" diff --git a/testing/tpm2-tools/dont-generate-manpages-without-pandoc.patch b/testing/tpm2-tools/dont-generate-manpages-without-pandoc.patch new file mode 100644 index 00000000000..a6830c3e51e --- /dev/null +++ b/testing/tpm2-tools/dont-generate-manpages-without-pandoc.patch @@ -0,0 +1,18 @@ +Author: Rasmus Thomsen <oss@cogitri.dev> +Reason: The logic in the configure.ac is wrong: Pandoc is a hard requirement +for the man pages and $srcdir/man/man1 always exists, so we need to use +AND here and not OR. +Upstream: No +diff --git a/configure.ac b/configure.ac +index 7b5c219..4331fd4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ AS_IF( + AM_CONDITIONAL([HAVE_PANDOC],[test "x${PANDOC}" = "xyes"]) + AM_CONDITIONAL( + [HAVE_MAN_PAGES], +- [test -d "${srcdir}/man/man1" -o "x${PANDOC}" = "xyes"]) ++ [test -d "${srcdir}/man/man1" -a "x${PANDOC}" = "xyes"]) + + AC_ARG_ENABLE([fapi], + [AS_HELP_STRING([--disable-fapi], [disable FAPI tools (default: auto)])],, |