diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 61 | ||||
| -rw-r--r-- | gcc12.patch | 27 |
4 files changed, 76 insertions, 29 deletions
@@ -1,16 +1,20 @@ pkgbase = flamethrower pkgdesc = DNS performance and functional testing utility - pkgver = 0.10 + pkgver = 0.11.0 pkgrel = 1 url = https://github.com/DNS-OARC/flamethrower arch = i686 arch = x86_64 - license = APACHE + arch = aarch64 + license = Apache makedepends = cmake depends = ldns depends = libuv - source = git+https://github.com/DNS-OARC/flamethrower.git#tag=v0.10 - sha256sums = SKIP + depends = gnutls + depends = libnghttp2 + source = flamethrower-0.11.0.tar.gz::https://github.com/DNS-OARC/flamethrower/archive/refs/tags/v0.11.0.tar.gz + source = gcc12.patch + sha256sums = 427f39d7e21e18e68b323a0b9b28260e7d0dedbb9d117b309bf550672fb3fb36 + sha256sums = a4f6d3969d0a6fc1ab27982100d6da87c051164f0ca24380bd34f97a58497f7e pkgname = flamethrower - diff --git a/.gitignore b/.gitignore index 7d4904735447..258caa7689a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/*.tar.gz -/*.tar.xz +/*.tar.* /pkg/ /src/ /flamethrower/ @@ -1,31 +1,48 @@ -# Maintainer: Karol Babioch <karol@babioch.de> +# Maintainer: tarball <bootctl@gmail.com> +# Contributor: Karol Babioch <karol@babioch.de> pkgname=flamethrower -pkgver=0.10 +pkgver=0.11.0 pkgrel=1 -pkgdesc="DNS performance and functional testing utility" -arch=('i686' 'x86_64') -url="https://github.com/DNS-OARC/flamethrower" -license=('APACHE') -depends=('ldns' 'libuv') -makedepends=('cmake') -source=("git+https://github.com/DNS-OARC/flamethrower.git#tag=v$pkgver") -sha256sums=('SKIP') +pkgdesc='DNS performance and functional testing utility' +arch=(i686 x86_64 aarch64) +url='https://github.com/DNS-OARC/flamethrower' +license=(Apache) +depends=(ldns libuv gnutls libnghttp2) +makedepends=(cmake) +source=( + "$pkgname-$pkgver.tar.gz::https://github.com/DNS-OARC/flamethrower/archive/refs/tags/v$pkgver.tar.gz" + 'gcc12.patch' +) +sha256sums=('427f39d7e21e18e68b323a0b9b28260e7d0dedbb9d117b309bf550672fb3fb36' + 'a4f6d3969d0a6fc1ab27982100d6da87c051164f0ca24380bd34f97a58497f7e') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <"$srcdir"/gcc12.patch +} build() { - cd "${srcdir}/${pkgname}" - # Fix a issue with CMake package name of ldns - sed -i 's/libldns/ldns/' CMakeLists.txt - mkdir -p build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make + cmake -B build -S "$srcdir/$pkgname-$pkgver" \ + -DCMAKE_BUILD_TYPE='None' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDOH_ENABLE=ON + + cmake --build build --target flame } package() { - cd "${srcdir}/${pkgname}" - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm0644 man/flame.1 "$pkgdir/usr/share/man/man1/flame.1" - cd build - install -Dm0755 flame "$pkgdir/usr/bin/flame" + cd "$srcdir/$pkgname-$pkgver" + + install -Dm755 "$srcdir"/build/flame \ + "$pkgdir/usr/bin/flame" + + install -Dm644 "$srcdir"/build/libflamecore.a \ + "$pkgdir/usr/lib/libflamecore.a" + + install -Dm644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + install -Dm644 man/flame.1 \ + "$pkgdir/usr/share/man/man1/flame.1" } diff --git a/gcc12.patch b/gcc12.patch new file mode 100644 index 000000000000..16af860bb244 --- /dev/null +++ b/gcc12.patch @@ -0,0 +1,27 @@ +From 5056602eb10316f4f1791ec5a7918e1ff40fe7fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com> +Date: Fri, 4 Feb 2022 19:07:02 +0100 +Subject: [PATCH] Compile under gcc 12.0.0 (#88) + +Add missing includes to query.cpp. It does not compile anymore on gcc 12 +without it. +--- + flame/query.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/flame/query.cpp b/flame/query.cpp +index 4f7ef21..fdd5f73 100644 +--- a/flame/query.cpp ++++ b/flame/query.cpp +@@ -5,9 +5,11 @@ + #include <algorithm> + #include <cctype> + #include <climits> ++#include <cstring> + #include <fstream> + #include <iomanip> + #include <iostream> ++#include <iterator> + #include <regex> + #include <sstream> + #include <stdexcept> |