From 08a8d7f00d640542b3833e7440d34395ce58838e Mon Sep 17 00:00:00 2001
From: psykose <alice@ayaya.dev>
Date: Fri, 26 Aug 2022 10:04:30 +0000
Subject: [PATCH] community/vectorscan: reduce -march level
---
community/vectorscan/APKBUILD | 14 ++++++--------
community/vectorscan/no-march-native.patch | 4 ++--
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/community/vectorscan/APKBUILD b/community/vectorscan/APKBUILD
index 00c306b9f4bd..57114f1b5d3a 100644
--- a/community/vectorscan/APKBUILD
+++ b/community/vectorscan/APKBUILD
@@ -2,14 +2,13 @@
# Maintainer: Duncan Bellamy <dunk@denkimushi.com>
pkgname=vectorscan
pkgver=5.4.7
-pkgrel=2
+pkgrel=3
pkgdesc="High-performance regular expression matching library"
url="https://www.hyperscan.io"
arch="x86 x86_64 aarch64 ppc64le" #requires SSSE3, Neon, or VSX
license="BSD-3-Clause"
makedepends="
boost-dev
- chrpath
clang
cmake
coreutils
@@ -34,10 +33,11 @@ build() {
cmake -B build -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_BUILD_TYPE=MinSizeRel \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
-DBUILD_STATIC_AND_SHARED=ON \
-DFAT_RUNTIME=OFF \
- "$CMAKE_CROSSOPTS" .
+ $CMAKE_CROSSOPTS .
cmake --build build --target all dev-reference
}
@@ -52,10 +52,8 @@ package() {
cd "$pkgdir"
install -Dm644 "$builddir"/LICENSE usr/share/licenses/$pkgname/LICENSE
mkdir -p usr/bin
- for _f in hsbench hscheck hscollider;
- do
+ for _f in hsbench hscheck hscollider; do
mv "$builddir"/build/bin/"$_f" usr/bin/
- chrpath -d usr/bin/"$_f"
done
mkdir -p usr/share/html
mv "$builddir"/build/doc/dev-reference/html usr/share/html/"$pkgname"
@@ -67,5 +65,5 @@ utils() {
sha512sums="
cdc35c39046579798fe26bb930c342d1deb32e1cf5a453dd97f1c8299e10712a48b99ee08656d1721569ffeb3923f0305acfc2c2c704e5eba32ba39e81dd616e vectorscan-5.4.7.tar.gz
-1fa2f030eea20d74efb283de5b2385f4156c12fed3bd4d76bde8fc3bf6abe512c41e410e48de59b0bcac3935b4952b5c0ea491608d0ab206097b77e294518cc6 no-march-native.patch
+162b8eb68afd7b11915e798fb174351f7b43a40c8332a73494c086b4e0544fb10892e67197f0a369c332a0114d63fa1d4f760491dbfe6974db3e421bd04023c9 no-march-native.patch
"
diff --git a/community/vectorscan/no-march-native.patch b/community/vectorscan/no-march-native.patch
index 36fc55521dd8..a11dfacbd4e8 100644
--- a/community/vectorscan/no-march-native.patch
+++ b/community/vectorscan/no-march-native.patch
@@ -1,4 +1,4 @@
-x86_64-v2 is the minimum
+x86_64 is the minimum
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,8 +191,11 @@
@@ -11,7 +11,7 @@ x86_64-v2 is the minimum
+ set(GNUCC_ARCH i586)
+ set(TUNE_FLAG generic)
+ elseif(ARCH_X86_64)
-+ set(GNUCC_ARCH x86-64-v2)
++ set(GNUCC_ARCH x86-64)
set(TUNE_FLAG generic)
elseif(ARCH_AARCH64)
set(GNUCC_ARCH armv8)
--
GitLab