zeek: fix build on ppc64*

This commit is contained in:
q66 2020-08-18 19:19:32 +02:00
parent 5bb1fceffe
commit 0d3b1f25fb
2 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,29 @@
From c65741bd62d462bab4410ce4f429ad33534cc0df Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 18 Aug 2020 19:12:19 +0200
Subject: [PATCH] fix vsx
---
src/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git src/CMakeLists.txt src/CMakeLists.txt
index 1d2d5c5..9140fa9 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -344,10 +344,10 @@ elseif (${COMPILER_ARCHITECTURE} STREQUAL "aarch64")
../auxil/highwayhash/highwayhash/hh_neon.cc
)
elseif (${COMPILER_ARCHITECTURE} STREQUAL "power")
- set_source_files_properties(../auxil/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
+ set_source_files_properties(../auxil/highwayhash/highwayhash/hh_vsx.cc PROPERTIES COMPILE_FLAGS
-mvsx)
list(APPEND HH_SRCS
- ../auxil/highwayhash/highwayhash/hh_vsc.cc
+ ../auxil/highwayhash/highwayhash/hh_vsx.cc
)
elseif(${COMPILER_ARCHITECTURE} STREQUAL "x86_64")
set_source_files_properties(../auxil/highwayhash/highwayhash/hh_avx2.cc PROPERTIES COMPILE_FLAGS
--
2.28.0

View File

@ -18,6 +18,19 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel musl-legacy-compat"
fi
post_patch() {
# no cpuid check in highwayhash for ppc since
# google pretends older hardware does not exist
case "$XBPS_TARGET_MACHINE" in
ppc64le*) ;;
ppc*)
vsed -i 's/"power"/"google-sucks"/' src/CMakeLists.txt
vsed -i 's/HH_ARCH_PPC/HH_ARCH_GOOGLE_SUCKS/g' \
auxil/highwayhash/highwayhash/instruction_sets.h
;;
esac
}
pre_configure() {
if [ "$CROSS_BUILD" ]; then
mkdir -p native