From fb5812f5541a2bad23e127c31b4edc9e39d4fe0c Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Tue, 13 Sep 2022 16:28:19 +0000 Subject: [PATCH 1/2] Bump vectorscan to 5.4.8 Brings good stuff like - https://github.com/VectorCamp/vectorscan/pull/119 - https://github.com/VectorCamp/vectorscan/pull/118 --- contrib/vectorscan | 2 +- contrib/vectorscan-cmake/CMakeLists.txt | 7 +------ contrib/vectorscan-cmake/{x86_64 => amd64}/config.h | 0 3 files changed, 2 insertions(+), 7 deletions(-) rename contrib/vectorscan-cmake/{x86_64 => amd64}/config.h (100%) diff --git a/contrib/vectorscan b/contrib/vectorscan index 73695e419c2..f6250ae3e5a 160000 --- a/contrib/vectorscan +++ b/contrib/vectorscan @@ -1 +1 @@ -Subproject commit 73695e419c27af7fe2a099c7aa57931cc02aea5d +Subproject commit f6250ae3e5a3085000239313ad0689cc1e00cdc2 diff --git a/contrib/vectorscan-cmake/CMakeLists.txt b/contrib/vectorscan-cmake/CMakeLists.txt index 828f2a17df2..a8b9bfa52ab 100644 --- a/contrib/vectorscan-cmake/CMakeLists.txt +++ b/contrib/vectorscan-cmake/CMakeLists.txt @@ -249,11 +249,6 @@ elseif (ARCH_AARCH64) "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/Parser.cpp" "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/control_verbs.cpp" ) - set_source_files_properties( - "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/Parser.cpp" - "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/control_verbs.cpp" - COMPILE_FLAGS -Wno-c++11-narrowing - ) endif() # Platform-dependent files @@ -304,7 +299,7 @@ target_include_directories (_vectorscan SYSTEM PUBLIC "${LIBRARY_DIR}/src") # Please regenerate these files if you update vectorscan. if (ARCH_AMD64) - target_include_directories (_vectorscan PRIVATE x86_64) + target_include_directories (_vectorscan PRIVATE amd64) endif () if (ARCH_AARCH64) diff --git a/contrib/vectorscan-cmake/x86_64/config.h b/contrib/vectorscan-cmake/amd64/config.h similarity index 100% rename from contrib/vectorscan-cmake/x86_64/config.h rename to contrib/vectorscan-cmake/amd64/config.h From 5aedf60689db88e99696da6d612958dc765e8ff7 Mon Sep 17 00:00:00 2001 From: Robert Schulze Date: Tue, 13 Sep 2022 20:51:51 +0000 Subject: [PATCH 2/2] fix: repair aarch64 build --- contrib/vectorscan-cmake/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/vectorscan-cmake/CMakeLists.txt b/contrib/vectorscan-cmake/CMakeLists.txt index a8b9bfa52ab..d6c626c1612 100644 --- a/contrib/vectorscan-cmake/CMakeLists.txt +++ b/contrib/vectorscan-cmake/CMakeLists.txt @@ -249,6 +249,11 @@ elseif (ARCH_AARCH64) "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/Parser.cpp" "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/control_verbs.cpp" ) + set_source_files_properties( + "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/Parser.cpp" + "${LIBRARY_DIR}/../vectorscan-cmake/rageled_files/aarch64/control_verbs.cpp" + COMPILE_FLAGS -Wno-c++11-narrowing + ) endif() # Platform-dependent files