author | David Runge
<dvzrv@archlinux.org> 2022-12-31 15:40:38 UTC |
committer | David Runge
<dvzrv@archlinux.org> 2022-12-31 15:40:38 UTC |
parent | 6e987ed2af988229619f91487b81577c30326917 |
PKGBUILD | +19 | -23 |
wolfssl-5.5.1-cmake.patch | +0 | -12 |
diff --git a/PKGBUILD b/PKGBUILD index 094cdac..db6762c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: David Runge <dvzrv@archlinux.org> pkgname=wolfssl -pkgver=5.5.3 +pkgver=5.5.4 pkgrel=1 pkgdesc="Lightweight, portable, C-language-based SSL/TLS library" arch=(x86_64) @@ -14,35 +14,31 @@ options=(debug) source=( $pkgname-$pkgver-stable.tar.gz::https://github.com/$pkgname/$pkgname/archive/refs/tags/v$pkgver-stable.tar.gz https://github.com/$pkgname/$pkgname/releases/download/v$pkgver-stable/$pkgname-$pkgver-stable.tar.gz.asc - $pkgname-5.5.1-cmake.patch ) -sha512sums=('ae0c2ae7834f24e2f3acbd2ef4dc9c0cfe94ac18d9404adef0ae681225c82aa3a13f7d1584ffd1bc59ff11696caa4f9837c6ba52513429755c95f4d999c9c115' - 'SKIP' - '02e2a6c370b2ad8e737b9d40d435a65babd8ce9c03892e1f1bf484d328f45bda4fe8be82cc051fdcda4946c405f8ea4baa6840d1db5ae54bec0dbc0dcce7da28') -b2sums=('840122df0b313255275612ef2c3519d0bf1fb0c0ac2a01a336b0e9d2cb07b7e0e387198559b176af225b49f6911851607bf0f92cc6df29da7b12de9700c25d87' - 'SKIP' - '82cee658075ffb8a2e1ebb2b0a8018b7edbacd29727f7aaca026c8d8808e48cfd617c2e22a01601a80d377423f57d7b6c7dc18186c2f59d8a7ab60bf37ce75ff') +sha512sums=('6ecb37d614ae7b8ea9caa5bedebe2bb16b2719e172e146fc707ce1ead09a6c4d168b8e8aa52255d4cf0341a0617f17d7f4b321ba88aaa77664861c31ca7a1163' + 'SKIP') +b2sums=('e3ee1e93b850cbe60909ed8811841b3ea6f05e6fa610f542a312a57d7dff7e7247118e12fd79363debfc94f6520dbfe167ac3a3c5c073fe4197ff8d1842d17ce' + 'SKIP') validpgpkeys=( A2A48E7BCB96C5BECB987314EBC80E415CA29677 # wolfSSL <secure@wolfssl.com> ) -prepare() { - # -Werror not even once: https://github.com/wolfSSL/wolfssl/issues/5553 - patch -Np1 -d $pkgname-$pkgver-stable -i ../$pkgname-5.5.1-cmake.patch -} - build() { - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DWOLFSSL_CURVE25519=ON \ - -DWOLFSSL_CURVE448=ON \ - -DWOLFSSL_ED25519=ON \ - -DWOLFSSL_ED448=ON \ - -DWOLFSSL_REPRODUCIBLE_BUILD=ON \ - -Wno-dev \ - -B build \ + local cmake_options=( + -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_BUILD_TYPE=None + -DWOLFSSL_CURVE25519=ON + -DWOLFSSL_CURVE448=ON + -DWOLFSSL_ED25519=ON + -DWOLFSSL_ED448=ON + -DWOLFSSL_REPRODUCIBLE_BUILD=ON + -DWARNING_C_FLAGS="$CFLAGS" + -Wno-dev + -B build -S $pkgname-$pkgver-stable + ) + + cmake "${cmake_options[@]}" cmake --build build --verbose } diff --git a/wolfssl-5.5.1-cmake.patch b/wolfssl-5.5.1-cmake.patch deleted file mode 100644 index e0b1f8d..0000000 --- a/wolfssl-5.5.1-cmake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2022-09-27 23:21:19.000000000 +0200 -+++ b/CMakeLists.txt 2022-09-28 13:26:25.001693738 +0200 -@@ -173,7 +173,7 @@ - # Windows cl.exe does not support the -Wextra, -Wno-unused and -Werror flags. - set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") - else() --set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Werror ${CMAKE_C_FLAGS}") -+set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused ${CMAKE_C_FLAGS}") - endif() - - ####################################################