diff --git a/highway/compile-only-emu128.patch b/highway/compile-only-emu128.patch deleted file mode 100644 index 60db5f339..000000000 --- a/highway/compile-only-emu128.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8212477..d8cc55f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -185,6 +185,9 @@ else() - -Wsign-conversion - -Wvla - -Wnon-virtual-dtor -+ -+ # Workaround for RV64GC without V -+ -DHWY_COMPILE_ONLY_EMU128 - ) - - if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") diff --git a/highway/riscv64.patch b/highway/riscv64.patch index 54ae68f4e..bcbbb3f5c 100644 --- a/highway/riscv64.patch +++ b/highway/riscv64.patch @@ -1,21 +1,12 @@ +diff --git PKGBUILD PKGBUILD +index d59be29..9c383f2 100644 --- PKGBUILD +++ PKGBUILD -@@ -9,8 +9,16 @@ url='https://github.com/google/highway/' - license=('Apache') - depends=('gcc-libs') - makedepends=('cmake' 'gtest') --source=("https://github.com/google/highway/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") --sha256sums=('5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5') -+source=("https://github.com/google/highway/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" -+ "compile-only-emu128.patch") -+sha256sums=('5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5' -+ '068ca74f3c33bed3ebd2ea5ef59c42e50b81101809893292335b9a38b47743cf') -+options=(!lto) -+ -+prepare() { -+ cd ${pkgname}-${pkgver} -+ patch -Np1 -i ../compile-only-emu128.patch -+} - - build() { - cmake -B build -S "${pkgname}-${pkgver}" \ +@@ -19,6 +19,7 @@ build() { + -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ + -DBUILD_SHARED_LIBS:BOOL='ON' \ + -DHWY_SYSTEM_GTEST:BOOL='ON' \ ++ -DHWY_CMAKE_RVV:BOOL='OFF' \ + -Wno-dev + cmake --build build + }