diff options
| author | Duncan Bellamy <dunk@denkimushi.com> | 2022-01-22 08:57:09 +0000 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2022-01-23 22:44:38 +0000 |
| commit | 67080e6c89872c022467d8403118229df7da36c8 (patch) | |
| tree | cb19b9d8fa3e828086871e65700f90a268aa6591 | |
| parent | 487f3a0dd9c64f7258ff76bf08557861af6b52f4 (diff) | |
community/vectorscan: upgrade to 5.4.6
* enable on ppc64le
* change build type to MinSizeRel
* let cmake set cpu tuning
* use x86_64 cmake options from debian rules
| -rw-r--r-- | community/vectorscan/APKBUILD | 27 | ||||
| -rw-r--r-- | community/vectorscan/version.patch | 11 |
2 files changed, 11 insertions, 27 deletions
diff --git a/community/vectorscan/APKBUILD b/community/vectorscan/APKBUILD index 8e5a519a56a..d9d620dfd83 100644 --- a/community/vectorscan/APKBUILD +++ b/community/vectorscan/APKBUILD @@ -1,25 +1,20 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Duncan Bellamy <dunk@denkimushi.com> pkgname=vectorscan -pkgver=5.4.4 +pkgver=5.4.6 pkgrel=0 pkgdesc="High-performance regular expression matching library" url="https://www.hyperscan.io" -arch="x86 x86_64 aarch64" #requires SSSE3 or Neon +arch="x86 x86_64 aarch64 ppc64le" #requires SSSE3, Neon, or VSX license="BSD-3-Clause" makedepends="cmake ragel boost-dev pcre-dev sqlite-dev py3-breathe chrpath" subpackages="$pkgname-doc $pkgname-dev $pkgname-utils" -source="$pkgname-$pkgver.tar.gz::https://github.com/vectorcamp/vectorscan/archive/v$pkgver+vectorscan.tar.gz - version.patch - " -builddir="$srcdir/$pkgname-$pkgver-$pkgname" +source="$pkgname-$pkgver.tar.gz::https://github.com/VectorCamp/vectorscan/archive/refs/tags/vectorscan/$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgname-$pkgver" build() { - local _march="-march=native" case "${CARCH:-native}" in - x86|x86_64) - _march="-march=core2" ;; - aarch64) - _march="-march=armv8-a" ;; + x86_64) CMAKE_EXTRAOPTS="-DBUILD_AVX2=on -DBUILD_AVX512=on \ + -DBUILD_AVX512VBMI=off -DFAT_RUNTIME=on" ;; esac if [ "$CBUILD" != "$CHOST" ]; then @@ -28,10 +23,11 @@ build() { cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_C_FLAGS="$CFLAGS $_march" \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS $_march" \ + -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DBUILD_STATIC_AND_SHARED=ON \ + "$CMAKE_EXTRAOPTS" \ "$CMAKE_CROSSOPTS" . cmake --build build --target all dev-reference } @@ -61,6 +57,5 @@ utils() { } sha512sums=" -68266b953a82962c6c8c5e5232a0932333967d18fd69aef2a1e58a25ded65f9b49ed863cea9824fe75e958999d5a64cdf35f63d19d5a4c566c5d1688642d5db5 vectorscan-5.4.4.tar.gz -a85f94c5680e1af8a94ae91eacaae6be0f71c92d85102881e98329d9c8af394ee24b8d599d8f0f316a3480aa6117f14b88d585b608cc8a8b0a231df473e796e0 version.patch +765cddc80a427c007bfa5926a9e1bfb0b5b912ff410c736cde2075c25a90ff6a9e25bd8e75a0d71e313c6e56a3316356d0c9b9f1b6af6883a426476555537405 vectorscan-5.4.6.tar.gz " diff --git a/community/vectorscan/version.patch b/community/vectorscan/version.patch deleted file mode 100644 index b843e110a6a..00000000000 --- a/community/vectorscan/version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ - - set (HS_MAJOR_VERSION 5) - set (HS_MINOR_VERSION 4) --set (HS_PATCH_VERSION 3) -+set (HS_PATCH_VERSION 4) - set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION}) - - set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) |