diff --git a/srcpkgs/spicy/patches/fix-cross.patch b/srcpkgs/spicy/patches/fix-cross.patch index d27777c1fd5..a3ca41d3738 100644 --- a/srcpkgs/spicy/patches/fix-cross.patch +++ b/srcpkgs/spicy/patches/fix-cross.patch @@ -18,9 +18,9 @@ # The cache is read from the environment variable `SPICY_CACHE` # if set; else a patch under the user's home directory is used. -@@ -61,14 +61,14 @@ - # NOTE: The compiler invocations here should be kept in sync - # with what we do in `CMakeLists.txt`. +@@ -68,14 +68,14 @@ + # Disable -Werror explicitly here to avoid this. It's fixed with GCC 14. + # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47857) cp "${LIBHILTI}" "${CACHE}/precompiled_libhilti_debug.h" -$("${HILTI_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti_debug.h.gch" +$(${CROSSCOMPILE_EMULATOR} "${HILTI_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti_debug.h.gch" @@ -31,9 +31,9 @@ +$(${CROSSCOMPILE_EMULATOR} "${HILTI_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBHILTI}" -o "${CACHE}/precompiled_libhilti.h.gch" cp "${LIBSPICY}" "${CACHE}/precompiled_libspicy_debug.h" --$("${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy_debug.h.gch" -+$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy_debug.h.gch" +-$("${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -Wno-error -o "${CACHE}/precompiled_libspicy_debug.h.gch" ++$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags --debug) -x c++-header "${LIBSPICY}" -Wno-error -o "${CACHE}/precompiled_libspicy_debug.h.gch" cp "${LIBSPICY}" "${CACHE}/precompiled_libspicy.h" --$("${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy.h.gch" -+$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -o "${CACHE}/precompiled_libspicy.h.gch" +-$("${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -Wno-error -o "${CACHE}/precompiled_libspicy.h.gch" ++$(${CROSSCOMPILE_EMULATOR} "${SPICY_CONFIG}" --cxx --cxxflags) -x c++-header "${LIBSPICY}" -Wno-error -o "${CACHE}/precompiled_libspicy.h.gch" diff --git a/srcpkgs/spicy/template b/srcpkgs/spicy/template index 39f0d1549a9..6fe010cd8a8 100644 --- a/srcpkgs/spicy/template +++ b/srcpkgs/spicy/template @@ -1,6 +1,6 @@ # Template file for 'spicy' pkgname=spicy -version=1.11.3 +version=1.12.0 revision=1 build_style=cmake build_helper=qemu @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://docs.zeek.org/projects/spicy/en/latest/" distfiles="https://github.com/zeek/spicy/releases/download/v${version}/spicy.tar.gz" -checksum=6631321ed26d05e798523424c813fa8ca1b41261bcdf84f5a1d716114d1c6757 +checksum=4b07c9ee1b4ebebc386d546ef456de29e218c28f3b24326a5135169d3ed9c005 if [ "$CROSS_BUILD" ]; then export CROSSCOMPILE_EMULATOR="/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static"