git: f7731a46b82f - main - security/zeek: fix build on non aarch64 / amd64 / armv? / i386

From: Piotr Kubaj <pkubaj_at_FreeBSD.org>
Date: Mon, 18 Jul 2022 07:16:40 UTC 
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f7731a46b82fb1a578193ef508e4c5707cf5b04b

commit f7731a46b82fb1a578193ef508e4c5707cf5b04b
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-07-18 06:06:26 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-07-18 07:16:39 +0000

    security/zeek: fix build on non aarch64 / amd64 / armv? / i386
    
    1. Enable SPICY only on aarch64 / amd64 / armv? / i386 as specified in
    https://github.com/zeek/spicy/blob/d0bc60537b53c3a951a0bdcb7b1c080bbb068abf/hilti/runtime/src/fiber.cc#L252
    2. Correct a parameter passed to CMake to disable Spicy.
    3. Correct pkg-plist for build with disabled Spicy.
    
    Approved by:    portmgr (blanket)
---
 security/zeek/Makefile  |   9 +-
 security/zeek/pkg-plist | 660 ++++++++++++++++++++++++------------------------
 2 files changed, 337 insertions(+), 332 deletions(-)

diff --git a/security/zeek/Makefile b/security/zeek/Makefile
index 7fc43d77d3c0..5667da465abe 100644
--- a/security/zeek/Makefile
+++ b/security/zeek/Makefile
@@ -64,7 +64,12 @@ OPTIONS_SINGLE=			BUILD_TYPE
 OPTIONS_SINGLE_BUILD_TYPE=	DEBUG MINSIZEREL RELEASE RELWITHDEBINFO
 
 OPTIONS_DEFAULT=	BROKER GEOIP2 IPSUMDUMP LBL_CF LBL_HF NETMAP RELEASE \
-			SPICY ZEEKCTL ZKG
+			ZEEKCTL ZKG
+OPTIONS_DEFAULT_aarch64=	SPICY
+OPTIONS_DEFAULT_amd64=	SPICY
+OPTIONS_DEFAULT_armv6=	SPICY
+OPTIONS_DEFAULT_armv7=	SPICY
+OPTIONS_DEFAULT_i386=	SPICY
 OPTIONS_SUB=		yes
 
 BROKER_DESC=		Enable the Broker communication library
@@ -97,7 +102,7 @@ PERFTOOLS_BUILD_DEPENDS=${LOCALBASE}/bin/perftools-pprof:devel/google-perftools
 PERFTOOLS_CMAKE_BOOL=	ENABLE_PERFTOOLS
 PERFTOOLS_RUN_DEPENDS=${LOCALBASE}/bin/perftools-pprof:devel/google-perftools
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
-SPICY_ENABLE=		spicy
+SPICY_CMAKE_OFF=	-DDISABLE_SPICY=ON
 SPICY_BUILD_DEPENDS=	bison>=3.3:devel/bison \
 			flex>=2.6:textproc/flex
 ZEEKCTL_BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
diff --git a/security/zeek/pkg-plist b/security/zeek/pkg-plist
index 3311d2a98f4c..4c52a2052a52 100644
--- a/security/zeek/pkg-plist
+++ b/security/zeek/pkg-plist
@@ -11,16 +11,16 @@ bin/broctl
 bin/broker-benchmark
 %%ZEEKCTL%%bin/capstats
 bin/gen-zam
-bin/hilti-config
-bin/hiltic
+%%SPICY%%bin/hilti-config
+%%SPICY%%bin/hiltic
 bin/paraglob-test
-bin/spicy-build
-bin/spicy-config
-bin/spicy-driver
-bin/spicy-dump
-bin/spicy-precompile-headers
-bin/spicyc
-bin/spicyz
+%%SPICY%%bin/spicy-build
+%%SPICY%%bin/spicy-config
+%%SPICY%%bin/spicy-driver
+%%SPICY%%bin/spicy-dump
+%%SPICY%%bin/spicy-precompile-headers
+%%SPICY%%bin/spicyc
+%%SPICY%%bin/spicyz
 %%ZEEKCTL%%bin/trace-summary
 bin/zeek
 bin/zeek-config
@@ -125,314 +125,314 @@ include/binpac/binpac_regex.h
 %%BROKER%%include/broker/version.hh
 %%BROKER%%include/broker/worker.hh
 %%BROKER%%include/broker/zeek.hh
-include/hilti/ast/all.h
-include/hilti/ast/ast.h
-include/hilti/ast/attribute.h
-include/hilti/ast/builder/all.h
-include/hilti/ast/builder/builder.h
-include/hilti/ast/builder/declaration.h
-include/hilti/ast/builder/expression.h
-include/hilti/ast/builder/type.h
-include/hilti/ast/ctor.h
-include/hilti/ast/ctors/address.h
-include/hilti/ast/ctors/all.h
-include/hilti/ast/ctors/bool.h
-include/hilti/ast/ctors/bytes.h
-include/hilti/ast/ctors/coerced.h
-include/hilti/ast/ctors/default.h
-include/hilti/ast/ctors/enum.h
-include/hilti/ast/ctors/error.h
-include/hilti/ast/ctors/exception.h
-include/hilti/ast/ctors/integer.h
-include/hilti/ast/ctors/interval.h
-include/hilti/ast/ctors/library.h
-include/hilti/ast/ctors/list.h
-include/hilti/ast/ctors/map.h
-include/hilti/ast/ctors/network.h
-include/hilti/ast/ctors/null.h
-include/hilti/ast/ctors/optional.h
-include/hilti/ast/ctors/port.h
-include/hilti/ast/ctors/real.h
-include/hilti/ast/ctors/reference.h
-include/hilti/ast/ctors/regexp.h
-include/hilti/ast/ctors/result.h
-include/hilti/ast/ctors/set.h
-include/hilti/ast/ctors/stream.h
-include/hilti/ast/ctors/string.h
-include/hilti/ast/ctors/struct.h
-include/hilti/ast/ctors/time.h
-include/hilti/ast/ctors/tuple.h
-include/hilti/ast/ctors/union.h
-include/hilti/ast/ctors/vector.h
-include/hilti/ast/declaration.h
-include/hilti/ast/declarations/all.h
-include/hilti/ast/declarations/constant.h
-include/hilti/ast/declarations/expression.h
-include/hilti/ast/declarations/field.h
-include/hilti/ast/declarations/function.h
-include/hilti/ast/declarations/global-variable.h
-include/hilti/ast/declarations/imported-module.h
-include/hilti/ast/declarations/local-variable.h
-include/hilti/ast/declarations/module.h
-include/hilti/ast/declarations/parameter.h
-include/hilti/ast/declarations/property.h
-include/hilti/ast/declarations/type.h
-include/hilti/ast/detail/operator-registry.h
-include/hilti/ast/detail/visitor.h
-include/hilti/ast/expression.h
-include/hilti/ast/expressions/all.h
-include/hilti/ast/expressions/assign.h
-include/hilti/ast/expressions/builtin-function.h
-include/hilti/ast/expressions/coerced.h
-include/hilti/ast/expressions/ctor.h
-include/hilti/ast/expressions/deferred.h
-include/hilti/ast/expressions/grouping.h
-include/hilti/ast/expressions/id.h
-include/hilti/ast/expressions/keyword.h
-include/hilti/ast/expressions/list-comprehension.h
-include/hilti/ast/expressions/logical-and.h
-include/hilti/ast/expressions/logical-not.h
-include/hilti/ast/expressions/logical-or.h
-include/hilti/ast/expressions/member.h
-include/hilti/ast/expressions/move.h
-include/hilti/ast/expressions/pending-coerced.h
-include/hilti/ast/expressions/resolved-operator.h
-include/hilti/ast/expressions/ternary.h
-include/hilti/ast/expressions/type-wrapped.h
-include/hilti/ast/expressions/type.h
-include/hilti/ast/expressions/typeinfo.h
-include/hilti/ast/expressions/unresolved-operator.h
-include/hilti/ast/expressions/void.h
-include/hilti/ast/function.h
-include/hilti/ast/id.h
-include/hilti/ast/location.h
-include/hilti/ast/meta.h
-include/hilti/ast/module.h
-include/hilti/ast/node-ref.h
-include/hilti/ast/node.h
-include/hilti/ast/operator.h
-include/hilti/ast/operators/address.h
-include/hilti/ast/operators/all.h
-include/hilti/ast/operators/bool.h
-include/hilti/ast/operators/bytes.h
-include/hilti/ast/operators/common.h
-include/hilti/ast/operators/enum.h
-include/hilti/ast/operators/error.h
-include/hilti/ast/operators/exception.h
-include/hilti/ast/operators/function.h
-include/hilti/ast/operators/generic.h
-include/hilti/ast/operators/interval.h
-include/hilti/ast/operators/list.h
-include/hilti/ast/operators/map.h
-include/hilti/ast/operators/network.h
-include/hilti/ast/operators/optional.h
-include/hilti/ast/operators/port.h
-include/hilti/ast/operators/real.h
-include/hilti/ast/operators/reference.h
-include/hilti/ast/operators/regexp.h
-include/hilti/ast/operators/result.h
-include/hilti/ast/operators/set.h
-include/hilti/ast/operators/signed-integer.h
-include/hilti/ast/operators/stream.h
-include/hilti/ast/operators/string.h
-include/hilti/ast/operators/struct.h
-include/hilti/ast/operators/time.h
-include/hilti/ast/operators/tuple.h
-include/hilti/ast/operators/union.h
-include/hilti/ast/operators/unsigned-integer.h
-include/hilti/ast/operators/vector.h
-include/hilti/ast/scope-lookup.h
-include/hilti/ast/scope.h
-include/hilti/ast/statement.h
-include/hilti/ast/statements/all.h
-include/hilti/ast/statements/assert.h
-include/hilti/ast/statements/block.h
-include/hilti/ast/statements/break.h
-include/hilti/ast/statements/comment.h
-include/hilti/ast/statements/continue.h
-include/hilti/ast/statements/declaration.h
-include/hilti/ast/statements/expression.h
-include/hilti/ast/statements/for.h
-include/hilti/ast/statements/if.h
-include/hilti/ast/statements/return.h
-include/hilti/ast/statements/set_location.h
-include/hilti/ast/statements/switch.h
-include/hilti/ast/statements/throw.h
-include/hilti/ast/statements/try.h
-include/hilti/ast/statements/while.h
-include/hilti/ast/statements/yield.h
-include/hilti/ast/type.h
-include/hilti/ast/types/address.h
-include/hilti/ast/types/all.h
-include/hilti/ast/types/any.h
-include/hilti/ast/types/auto.h
-include/hilti/ast/types/bool.h
-include/hilti/ast/types/bytes.h
-include/hilti/ast/types/doc-only.h
-include/hilti/ast/types/enum.h
-include/hilti/ast/types/error.h
-include/hilti/ast/types/exception.h
-include/hilti/ast/types/function.h
-include/hilti/ast/types/integer.h
-include/hilti/ast/types/interval.h
-include/hilti/ast/types/library.h
-include/hilti/ast/types/list.h
-include/hilti/ast/types/map.h
-include/hilti/ast/types/member.h
-include/hilti/ast/types/network.h
-include/hilti/ast/types/null.h
-include/hilti/ast/types/operand-list.h
-include/hilti/ast/types/optional.h
-include/hilti/ast/types/port.h
-include/hilti/ast/types/real.h
-include/hilti/ast/types/reference.h
-include/hilti/ast/types/regexp.h
-include/hilti/ast/types/result.h
-include/hilti/ast/types/set.h
-include/hilti/ast/types/stream.h
-include/hilti/ast/types/string.h
-include/hilti/ast/types/struct.h
-include/hilti/ast/types/time.h
-include/hilti/ast/types/tuple.h
-include/hilti/ast/types/type.h
-include/hilti/ast/types/union.h
-include/hilti/ast/types/unknown.h
-include/hilti/ast/types/unresolved-id.h
-include/hilti/ast/types/vector.h
-include/hilti/ast/types/void.h
-include/hilti/autogen/__ctor.h
-include/hilti/autogen/__declaration.h
-include/hilti/autogen/__dispatchers.h
-include/hilti/autogen/__expression.h
-include/hilti/autogen/__node.h
-include/hilti/autogen/__operator.h
-include/hilti/autogen/__resolved-operator.h
-include/hilti/autogen/__statement.h
-include/hilti/autogen/__type.h
-include/hilti/autogen/config.h
-include/hilti/base/cache.h
-include/hilti/base/code-formatter.h
-include/hilti/base/id-base.h
-include/hilti/base/intrusive-ptr.h
-include/hilti/base/logger.h
-include/hilti/base/optional-ref.h
-include/hilti/base/preprocessor.h
-include/hilti/base/result.h
-include/hilti/base/timing.h
-include/hilti/base/type_erase.h
-include/hilti/base/uniquer.h
-include/hilti/base/util.h
-include/hilti/base/visitor-types.h
-include/hilti/base/visitor-util.h
-include/hilti/base/visitor.h
-include/hilti/compiler/coercion.h
-include/hilti/compiler/context.h
-include/hilti/compiler/detail/codegen/codegen.h
-include/hilti/compiler/detail/cxx/all.h
-include/hilti/compiler/detail/cxx/elements.h
-include/hilti/compiler/detail/cxx/formatter.h
-include/hilti/compiler/detail/cxx/linker.h
-include/hilti/compiler/detail/cxx/unit.h
-include/hilti/compiler/detail/parser/driver.h
-include/hilti/compiler/detail/parser/scanner.h
-include/hilti/compiler/detail/visitors.h
-include/hilti/compiler/driver.h
-include/hilti/compiler/init.h
-include/hilti/compiler/jit.h
-include/hilti/compiler/optimizer.h
-include/hilti/compiler/plugin.h
-include/hilti/compiler/printer.h
-include/hilti/compiler/unit.h
-include/hilti/global.h
-include/hilti/hilti.h
-include/hilti/rt/3rdparty/ArticleEnumClass-v2/EnumClass.h
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/0/SafeInt_3017p.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/1/SafeInt_3016p.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/2/TestMain.h
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/3/SafeInt_3015p.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/4/SafeInt_3014p.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/4/SafeInt_gcc.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/5/SafeInt_gcc.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/6/SafeInt_3012p.hpp
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/6/SafeInt_gcc.h
-include/hilti/rt/3rdparty/SafeInt/Archive/releases/7/SafeInt_3011p.hpp
-include/hilti/rt/3rdparty/SafeInt/SafeInt.hpp
-include/hilti/rt/3rdparty/SafeInt/Test/TestMain.h
-include/hilti/rt/3rdparty/any/any.hpp
-include/hilti/rt/3rdparty/any/test_shared_lib.hpp
-include/hilti/rt/3rdparty/ghc/filesystem.hpp
-include/hilti/rt/3rdparty/ghc/fs_fwd.hpp
-include/hilti/rt/3rdparty/ghc/fs_impl.hpp
-include/hilti/rt/3rdparty/ghc/fs_std.hpp
-include/hilti/rt/3rdparty/ghc/fs_std_fwd.hpp
-include/hilti/rt/3rdparty/ghc/fs_std_impl.hpp
-include/hilti/rt/3rdparty/nlohmann/json_fwd.hpp
-include/hilti/rt/3rdparty/tinyformat/tinyformat.h
-include/hilti/rt/any.h
-include/hilti/rt/autogen/config.h
-include/hilti/rt/autogen/tests/config.h
-include/hilti/rt/autogen/version.h
-include/hilti/rt/backtrace.h
-include/hilti/rt/compiler-setup.h
-include/hilti/rt/configuration.h
-include/hilti/rt/context.h
-include/hilti/rt/debug-logger.h
-include/hilti/rt/deferred-expression.h
-include/hilti/rt/doctest.h
-include/hilti/rt/exception.h
-include/hilti/rt/extension-points.h
-include/hilti/rt/fiber.h
-include/hilti/rt/filesystem.h
-include/hilti/rt/fmt.h
-include/hilti/rt/global-state.h
-include/hilti/rt/hilti.h
-include/hilti/rt/hilti/rt
-include/hilti/rt/init.h
-include/hilti/rt/intrusive-ptr.h
-include/hilti/rt/iterator.h
-include/hilti/rt/json-fwd.h
-include/hilti/rt/json.h
-include/hilti/rt/lambda.h
-include/hilti/rt/libhilti.h
-include/hilti/rt/library.h
-include/hilti/rt/linker.h
-include/hilti/rt/logging.h
-include/hilti/rt/result.h
-include/hilti/rt/safe-int.h
-include/hilti/rt/test/utils.h
-include/hilti/rt/threading.h
-include/hilti/rt/type-info.h
-include/hilti/rt/types/address.h
-include/hilti/rt/types/all.h
-include/hilti/rt/types/any.h
-include/hilti/rt/types/bool.h
-include/hilti/rt/types/bytes.h
-include/hilti/rt/types/enum.h
-include/hilti/rt/types/error.h
-include/hilti/rt/types/function.h
-include/hilti/rt/types/integer.h
-include/hilti/rt/types/interval.h
-include/hilti/rt/types/map.h
-include/hilti/rt/types/network.h
-include/hilti/rt/types/null.h
-include/hilti/rt/types/optional.h
-include/hilti/rt/types/port.h
-include/hilti/rt/types/real.h
-include/hilti/rt/types/reference.h
-include/hilti/rt/types/regexp.h
-include/hilti/rt/types/result.h
-include/hilti/rt/types/set.h
-include/hilti/rt/types/set_fwd.h
-include/hilti/rt/types/stream.h
-include/hilti/rt/types/string.h
-include/hilti/rt/types/struct.h
-include/hilti/rt/types/time.h
-include/hilti/rt/types/tuple.h
-include/hilti/rt/types/union.h
-include/hilti/rt/types/vector.h
-include/hilti/rt/types/vector_fwd.h
-include/hilti/rt/unpack.h
-include/hilti/rt/util.h
+%%SPICY%%include/hilti/ast/all.h
+%%SPICY%%include/hilti/ast/ast.h
+%%SPICY%%include/hilti/ast/attribute.h
+%%SPICY%%include/hilti/ast/builder/all.h
+%%SPICY%%include/hilti/ast/builder/builder.h
+%%SPICY%%include/hilti/ast/builder/declaration.h
+%%SPICY%%include/hilti/ast/builder/expression.h
+%%SPICY%%include/hilti/ast/builder/type.h
+%%SPICY%%include/hilti/ast/ctor.h
+%%SPICY%%include/hilti/ast/ctors/address.h
+%%SPICY%%include/hilti/ast/ctors/all.h
+%%SPICY%%include/hilti/ast/ctors/bool.h
+%%SPICY%%include/hilti/ast/ctors/bytes.h
+%%SPICY%%include/hilti/ast/ctors/coerced.h
+%%SPICY%%include/hilti/ast/ctors/default.h
+%%SPICY%%include/hilti/ast/ctors/enum.h
+%%SPICY%%include/hilti/ast/ctors/error.h
+%%SPICY%%include/hilti/ast/ctors/exception.h
+%%SPICY%%include/hilti/ast/ctors/integer.h
+%%SPICY%%include/hilti/ast/ctors/interval.h
+%%SPICY%%include/hilti/ast/ctors/library.h
+%%SPICY%%include/hilti/ast/ctors/list.h
+%%SPICY%%include/hilti/ast/ctors/map.h
+%%SPICY%%include/hilti/ast/ctors/network.h
+%%SPICY%%include/hilti/ast/ctors/null.h
+%%SPICY%%include/hilti/ast/ctors/optional.h
+%%SPICY%%include/hilti/ast/ctors/port.h
+%%SPICY%%include/hilti/ast/ctors/real.h
+%%SPICY%%include/hilti/ast/ctors/reference.h
+%%SPICY%%include/hilti/ast/ctors/regexp.h
+%%SPICY%%include/hilti/ast/ctors/result.h
+%%SPICY%%include/hilti/ast/ctors/set.h
+%%SPICY%%include/hilti/ast/ctors/stream.h
+%%SPICY%%include/hilti/ast/ctors/string.h
+%%SPICY%%include/hilti/ast/ctors/struct.h
+%%SPICY%%include/hilti/ast/ctors/time.h
+%%SPICY%%include/hilti/ast/ctors/tuple.h
+%%SPICY%%include/hilti/ast/ctors/union.h
+%%SPICY%%include/hilti/ast/ctors/vector.h
+%%SPICY%%include/hilti/ast/declaration.h
+%%SPICY%%include/hilti/ast/declarations/all.h
+%%SPICY%%include/hilti/ast/declarations/constant.h
+%%SPICY%%include/hilti/ast/declarations/expression.h
+%%SPICY%%include/hilti/ast/declarations/field.h
+%%SPICY%%include/hilti/ast/declarations/function.h
+%%SPICY%%include/hilti/ast/declarations/global-variable.h
+%%SPICY%%include/hilti/ast/declarations/imported-module.h
+%%SPICY%%include/hilti/ast/declarations/local-variable.h
+%%SPICY%%include/hilti/ast/declarations/module.h
+%%SPICY%%include/hilti/ast/declarations/parameter.h
+%%SPICY%%include/hilti/ast/declarations/property.h
+%%SPICY%%include/hilti/ast/declarations/type.h
+%%SPICY%%include/hilti/ast/detail/operator-registry.h
+%%SPICY%%include/hilti/ast/detail/visitor.h
+%%SPICY%%include/hilti/ast/expression.h
+%%SPICY%%include/hilti/ast/expressions/all.h
+%%SPICY%%include/hilti/ast/expressions/assign.h
+%%SPICY%%include/hilti/ast/expressions/builtin-function.h
+%%SPICY%%include/hilti/ast/expressions/coerced.h
+%%SPICY%%include/hilti/ast/expressions/ctor.h
+%%SPICY%%include/hilti/ast/expressions/deferred.h
+%%SPICY%%include/hilti/ast/expressions/grouping.h
+%%SPICY%%include/hilti/ast/expressions/id.h
+%%SPICY%%include/hilti/ast/expressions/keyword.h
+%%SPICY%%include/hilti/ast/expressions/list-comprehension.h
+%%SPICY%%include/hilti/ast/expressions/logical-and.h
+%%SPICY%%include/hilti/ast/expressions/logical-not.h
+%%SPICY%%include/hilti/ast/expressions/logical-or.h
+%%SPICY%%include/hilti/ast/expressions/member.h
+%%SPICY%%include/hilti/ast/expressions/move.h
+%%SPICY%%include/hilti/ast/expressions/pending-coerced.h
+%%SPICY%%include/hilti/ast/expressions/resolved-operator.h
+%%SPICY%%include/hilti/ast/expressions/ternary.h
+%%SPICY%%include/hilti/ast/expressions/type-wrapped.h
+%%SPICY%%include/hilti/ast/expressions/type.h
+%%SPICY%%include/hilti/ast/expressions/typeinfo.h
+%%SPICY%%include/hilti/ast/expressions/unresolved-operator.h
+%%SPICY%%include/hilti/ast/expressions/void.h
+%%SPICY%%include/hilti/ast/function.h
+%%SPICY%%include/hilti/ast/id.h
+%%SPICY%%include/hilti/ast/location.h
+%%SPICY%%include/hilti/ast/meta.h
+%%SPICY%%include/hilti/ast/module.h
+%%SPICY%%include/hilti/ast/node-ref.h
+%%SPICY%%include/hilti/ast/node.h
+%%SPICY%%include/hilti/ast/operator.h
+%%SPICY%%include/hilti/ast/operators/address.h
+%%SPICY%%include/hilti/ast/operators/all.h
+%%SPICY%%include/hilti/ast/operators/bool.h
+%%SPICY%%include/hilti/ast/operators/bytes.h
+%%SPICY%%include/hilti/ast/operators/common.h
+%%SPICY%%include/hilti/ast/operators/enum.h
+%%SPICY%%include/hilti/ast/operators/error.h
+%%SPICY%%include/hilti/ast/operators/exception.h
+%%SPICY%%include/hilti/ast/operators/function.h
+%%SPICY%%include/hilti/ast/operators/generic.h
+%%SPICY%%include/hilti/ast/operators/interval.h
+%%SPICY%%include/hilti/ast/operators/list.h
+%%SPICY%%include/hilti/ast/operators/map.h
+%%SPICY%%include/hilti/ast/operators/network.h
+%%SPICY%%include/hilti/ast/operators/optional.h
+%%SPICY%%include/hilti/ast/operators/port.h
+%%SPICY%%include/hilti/ast/operators/real.h
+%%SPICY%%include/hilti/ast/operators/reference.h
+%%SPICY%%include/hilti/ast/operators/regexp.h
+%%SPICY%%include/hilti/ast/operators/result.h
+%%SPICY%%include/hilti/ast/operators/set.h
+%%SPICY%%include/hilti/ast/operators/signed-integer.h
+%%SPICY%%include/hilti/ast/operators/stream.h
+%%SPICY%%include/hilti/ast/operators/string.h
+%%SPICY%%include/hilti/ast/operators/struct.h
+%%SPICY%%include/hilti/ast/operators/time.h
+%%SPICY%%include/hilti/ast/operators/tuple.h
+%%SPICY%%include/hilti/ast/operators/union.h
+%%SPICY%%include/hilti/ast/operators/unsigned-integer.h
+%%SPICY%%include/hilti/ast/operators/vector.h
+%%SPICY%%include/hilti/ast/scope-lookup.h
+%%SPICY%%include/hilti/ast/scope.h
+%%SPICY%%include/hilti/ast/statement.h
+%%SPICY%%include/hilti/ast/statements/all.h
+%%SPICY%%include/hilti/ast/statements/assert.h
+%%SPICY%%include/hilti/ast/statements/block.h
+%%SPICY%%include/hilti/ast/statements/break.h
+%%SPICY%%include/hilti/ast/statements/comment.h
+%%SPICY%%include/hilti/ast/statements/continue.h
+%%SPICY%%include/hilti/ast/statements/declaration.h
+%%SPICY%%include/hilti/ast/statements/expression.h
+%%SPICY%%include/hilti/ast/statements/for.h
+%%SPICY%%include/hilti/ast/statements/if.h
+%%SPICY%%include/hilti/ast/statements/return.h
+%%SPICY%%include/hilti/ast/statements/set_location.h
+%%SPICY%%include/hilti/ast/statements/switch.h
+%%SPICY%%include/hilti/ast/statements/throw.h
+%%SPICY%%include/hilti/ast/statements/try.h
+%%SPICY%%include/hilti/ast/statements/while.h
+%%SPICY%%include/hilti/ast/statements/yield.h
+%%SPICY%%include/hilti/ast/type.h
+%%SPICY%%include/hilti/ast/types/address.h
+%%SPICY%%include/hilti/ast/types/all.h
+%%SPICY%%include/hilti/ast/types/any.h
+%%SPICY%%include/hilti/ast/types/auto.h
+%%SPICY%%include/hilti/ast/types/bool.h
+%%SPICY%%include/hilti/ast/types/bytes.h
+%%SPICY%%include/hilti/ast/types/doc-only.h
+%%SPICY%%include/hilti/ast/types/enum.h
+%%SPICY%%include/hilti/ast/types/error.h
+%%SPICY%%include/hilti/ast/types/exception.h
+%%SPICY%%include/hilti/ast/types/function.h
+%%SPICY%%include/hilti/ast/types/integer.h
+%%SPICY%%include/hilti/ast/types/interval.h
+%%SPICY%%include/hilti/ast/types/library.h
+%%SPICY%%include/hilti/ast/types/list.h
+%%SPICY%%include/hilti/ast/types/map.h
+%%SPICY%%include/hilti/ast/types/member.h
+%%SPICY%%include/hilti/ast/types/network.h
+%%SPICY%%include/hilti/ast/types/null.h
+%%SPICY%%include/hilti/ast/types/operand-list.h
+%%SPICY%%include/hilti/ast/types/optional.h
+%%SPICY%%include/hilti/ast/types/port.h
+%%SPICY%%include/hilti/ast/types/real.h
+%%SPICY%%include/hilti/ast/types/reference.h
+%%SPICY%%include/hilti/ast/types/regexp.h
+%%SPICY%%include/hilti/ast/types/result.h
+%%SPICY%%include/hilti/ast/types/set.h
+%%SPICY%%include/hilti/ast/types/stream.h
+%%SPICY%%include/hilti/ast/types/string.h
+%%SPICY%%include/hilti/ast/types/struct.h
+%%SPICY%%include/hilti/ast/types/time.h
+%%SPICY%%include/hilti/ast/types/tuple.h
+%%SPICY%%include/hilti/ast/types/type.h
+%%SPICY%%include/hilti/ast/types/union.h
+%%SPICY%%include/hilti/ast/types/unknown.h
+%%SPICY%%include/hilti/ast/types/unresolved-id.h
+%%SPICY%%include/hilti/ast/types/vector.h
+%%SPICY%%include/hilti/ast/types/void.h
+%%SPICY%%include/hilti/autogen/__ctor.h
+%%SPICY%%include/hilti/autogen/__declaration.h
+%%SPICY%%include/hilti/autogen/__dispatchers.h
+%%SPICY%%include/hilti/autogen/__expression.h
+%%SPICY%%include/hilti/autogen/__node.h
+%%SPICY%%include/hilti/autogen/__operator.h
+%%SPICY%%include/hilti/autogen/__resolved-operator.h
+%%SPICY%%include/hilti/autogen/__statement.h
+%%SPICY%%include/hilti/autogen/__type.h
+%%SPICY%%include/hilti/autogen/config.h
+%%SPICY%%include/hilti/base/cache.h
+%%SPICY%%include/hilti/base/code-formatter.h
+%%SPICY%%include/hilti/base/id-base.h
+%%SPICY%%include/hilti/base/intrusive-ptr.h
+%%SPICY%%include/hilti/base/logger.h
+%%SPICY%%include/hilti/base/optional-ref.h
+%%SPICY%%include/hilti/base/preprocessor.h
+%%SPICY%%include/hilti/base/result.h
+%%SPICY%%include/hilti/base/timing.h
+%%SPICY%%include/hilti/base/type_erase.h
+%%SPICY%%include/hilti/base/uniquer.h
+%%SPICY%%include/hilti/base/util.h
+%%SPICY%%include/hilti/base/visitor-types.h
+%%SPICY%%include/hilti/base/visitor-util.h
+%%SPICY%%include/hilti/base/visitor.h
+%%SPICY%%include/hilti/compiler/coercion.h
+%%SPICY%%include/hilti/compiler/context.h
+%%SPICY%%include/hilti/compiler/detail/codegen/codegen.h
+%%SPICY%%include/hilti/compiler/detail/cxx/all.h
+%%SPICY%%include/hilti/compiler/detail/cxx/elements.h
+%%SPICY%%include/hilti/compiler/detail/cxx/formatter.h
+%%SPICY%%include/hilti/compiler/detail/cxx/linker.h
+%%SPICY%%include/hilti/compiler/detail/cxx/unit.h
+%%SPICY%%include/hilti/compiler/detail/parser/driver.h
+%%SPICY%%include/hilti/compiler/detail/parser/scanner.h
+%%SPICY%%include/hilti/compiler/detail/visitors.h
+%%SPICY%%include/hilti/compiler/driver.h
+%%SPICY%%include/hilti/compiler/init.h
+%%SPICY%%include/hilti/compiler/jit.h
+%%SPICY%%include/hilti/compiler/optimizer.h
+%%SPICY%%include/hilti/compiler/plugin.h
+%%SPICY%%include/hilti/compiler/printer.h
+%%SPICY%%include/hilti/compiler/unit.h
+%%SPICY%%include/hilti/global.h
+%%SPICY%%include/hilti/hilti.h
+%%SPICY%%include/hilti/rt/3rdparty/ArticleEnumClass-v2/EnumClass.h
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/0/SafeInt_3017p.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/1/SafeInt_3016p.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/2/TestMain.h
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/3/SafeInt_3015p.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/4/SafeInt_3014p.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/4/SafeInt_gcc.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/5/SafeInt_gcc.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/6/SafeInt_3012p.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/6/SafeInt_gcc.h
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Archive/releases/7/SafeInt_3011p.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/SafeInt.hpp
+%%SPICY%%include/hilti/rt/3rdparty/SafeInt/Test/TestMain.h
+%%SPICY%%include/hilti/rt/3rdparty/any/any.hpp
+%%SPICY%%include/hilti/rt/3rdparty/any/test_shared_lib.hpp
+%%SPICY%%include/hilti/rt/3rdparty/ghc/filesystem.hpp
+%%SPICY%%include/hilti/rt/3rdparty/ghc/fs_fwd.hpp
+%%SPICY%%include/hilti/rt/3rdparty/ghc/fs_impl.hpp
+%%SPICY%%include/hilti/rt/3rdparty/ghc/fs_std.hpp
+%%SPICY%%include/hilti/rt/3rdparty/ghc/fs_std_fwd.hpp
+%%SPICY%%include/hilti/rt/3rdparty/ghc/fs_std_impl.hpp
+%%SPICY%%include/hilti/rt/3rdparty/nlohmann/json_fwd.hpp
+%%SPICY%%include/hilti/rt/3rdparty/tinyformat/tinyformat.h
+%%SPICY%%include/hilti/rt/any.h
+%%SPICY%%include/hilti/rt/autogen/config.h
+%%SPICY%%include/hilti/rt/autogen/tests/config.h
+%%SPICY%%include/hilti/rt/autogen/version.h
+%%SPICY%%include/hilti/rt/backtrace.h
+%%SPICY%%include/hilti/rt/compiler-setup.h
+%%SPICY%%include/hilti/rt/configuration.h
+%%SPICY%%include/hilti/rt/context.h
+%%SPICY%%include/hilti/rt/debug-logger.h
+%%SPICY%%include/hilti/rt/deferred-expression.h
+%%SPICY%%include/hilti/rt/doctest.h
+%%SPICY%%include/hilti/rt/exception.h
+%%SPICY%%include/hilti/rt/extension-points.h
+%%SPICY%%include/hilti/rt/fiber.h
+%%SPICY%%include/hilti/rt/filesystem.h
+%%SPICY%%include/hilti/rt/fmt.h
+%%SPICY%%include/hilti/rt/global-state.h
+%%SPICY%%include/hilti/rt/hilti.h
+%%SPICY%%include/hilti/rt/hilti/rt
+%%SPICY%%include/hilti/rt/init.h
+%%SPICY%%include/hilti/rt/intrusive-ptr.h
+%%SPICY%%include/hilti/rt/iterator.h
+%%SPICY%%include/hilti/rt/json-fwd.h
+%%SPICY%%include/hilti/rt/json.h
+%%SPICY%%include/hilti/rt/lambda.h
+%%SPICY%%include/hilti/rt/libhilti.h
+%%SPICY%%include/hilti/rt/library.h
+%%SPICY%%include/hilti/rt/linker.h
+%%SPICY%%include/hilti/rt/logging.h
+%%SPICY%%include/hilti/rt/result.h
+%%SPICY%%include/hilti/rt/safe-int.h
+%%SPICY%%include/hilti/rt/test/utils.h
+%%SPICY%%include/hilti/rt/threading.h
+%%SPICY%%include/hilti/rt/type-info.h
+%%SPICY%%include/hilti/rt/types/address.h
+%%SPICY%%include/hilti/rt/types/all.h
+%%SPICY%%include/hilti/rt/types/any.h
+%%SPICY%%include/hilti/rt/types/bool.h
+%%SPICY%%include/hilti/rt/types/bytes.h
+%%SPICY%%include/hilti/rt/types/enum.h
+%%SPICY%%include/hilti/rt/types/error.h
+%%SPICY%%include/hilti/rt/types/function.h
+%%SPICY%%include/hilti/rt/types/integer.h
+%%SPICY%%include/hilti/rt/types/interval.h
+%%SPICY%%include/hilti/rt/types/map.h
+%%SPICY%%include/hilti/rt/types/network.h
+%%SPICY%%include/hilti/rt/types/null.h
+%%SPICY%%include/hilti/rt/types/optional.h
+%%SPICY%%include/hilti/rt/types/port.h
+%%SPICY%%include/hilti/rt/types/real.h
+%%SPICY%%include/hilti/rt/types/reference.h
+%%SPICY%%include/hilti/rt/types/regexp.h
+%%SPICY%%include/hilti/rt/types/result.h
+%%SPICY%%include/hilti/rt/types/set.h
+%%SPICY%%include/hilti/rt/types/set_fwd.h
+%%SPICY%%include/hilti/rt/types/stream.h
+%%SPICY%%include/hilti/rt/types/string.h
+%%SPICY%%include/hilti/rt/types/struct.h
+%%SPICY%%include/hilti/rt/types/time.h
+%%SPICY%%include/hilti/rt/types/tuple.h
+%%SPICY%%include/hilti/rt/types/union.h
+%%SPICY%%include/hilti/rt/types/vector.h
+%%SPICY%%include/hilti/rt/types/vector_fwd.h
+%%SPICY%%include/hilti/rt/unpack.h
+%%SPICY%%include/hilti/rt/util.h
 include/paraglob/exceptions.h
 include/paraglob/node.h
 include/paraglob/paraglob.h
@@ -980,10 +980,10 @@ include/zeek/broker/comm.bif.h
 include/zeek/broker/data.bif.h
 include/zeek/broker/messaging.bif.h
 include/zeek/broker/store.bif.h
-include/zeek/builtin-plugins/spicy-plugin/consts.bif.h
-include/zeek/builtin-plugins/spicy-plugin/events.bif.h
-include/zeek/builtin-plugins/spicy-plugin/functions.bif.h
-include/zeek/builtin-plugins/spicy-plugin/lib/zeek-spicy
+%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/consts.bif.h
+%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/events.bif.h
+%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/functions.bif.h
+%%SPICY%%include/zeek/builtin-plugins/spicy-plugin/lib/zeek-spicy
 include/zeek/const.bif.func_h
 include/zeek/const.bif.netvar_h
 include/zeek/digest.h
@@ -1225,9 +1225,9 @@ lib/libbinpac.so
 lib/libbinpac.so.0
 lib/libbinpac.so.0.59
 %%BROKER%%lib/libbroker.a
-lib/libhilti-rt-debug.a
-lib/libhilti-rt.a
-lib/libhilti.a
+%%SPICY%%lib/libhilti-rt-debug.a
+%%SPICY%%lib/libhilti-rt.a
+%%SPICY%%lib/libhilti.a
 lib/libparaglob.a
 %%SPICY%%lib/libspicy-rt-debug.a
 %%SPICY%%lib/libspicy-rt.a
@@ -1314,7 +1314,7 @@ share/btest/scripts/diff-sort
 share/btest/scripts/diff-sort-and-remove-abspath
 share/btest/scripts/diff-sort-conn-service
 share/btest/scripts/diff-sort-set-elements
-share/hilti/hilti.hlt
+%%SPICY%%share/hilti/hilti.hlt
 %%SPICY%%share/spicy/filter.spicy
 %%SPICY%%share/spicy/spicy-driver-host.cc
 %%SPICY%%share/spicy/spicy.spicy
@@ -1443,9 +1443,9 @@ share/hilti/hilti.hlt
 %%DATADIR%%/base/bif/plugins/Zeek_SSL.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_SSL.functions.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_SSL.types.bif.zeek
-%%DATADIR%%/base/bif/plugins/Zeek_Spicy.consts.bif.zeek
-%%DATADIR%%/base/bif/plugins/Zeek_Spicy.events.bif.zeek
-%%DATADIR%%/base/bif/plugins/Zeek_Spicy.functions.bif.zeek
+%%SPICY%%%%DATADIR%%/base/bif/plugins/Zeek_Spicy.consts.bif.zeek
+%%SPICY%%%%DATADIR%%/base/bif/plugins/Zeek_Spicy.events.bif.zeek
+%%SPICY%%%%DATADIR%%/base/bif/plugins/Zeek_Spicy.functions.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_Syslog.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_TCP.events.bif.zeek
 %%DATADIR%%/base/bif/plugins/Zeek_TCP.functions.bif.zeek
@@ -1842,7 +1842,7 @@ share/hilti/hilti.hlt
 %%DATADIR%%/cmake/FindPackageMessage.cmake
 %%DATADIR%%/cmake/FindPythonDev.cmake
 %%DATADIR%%/cmake/FindRequiredPackage.cmake
-%%DATADIR%%/cmake/FindSpicy.cmake
+%%SPICY%%%%DATADIR%%/cmake/FindSpicy.cmake
 %%DATADIR%%/cmake/FindSubnetTree.cmake
 %%DATADIR%%/cmake/FindTraceSummary.cmake
 %%DATADIR%%/cmake/FindZeek.cmake
@@ -1869,7 +1869,7 @@ share/hilti/hilti.hlt
 %%DATADIR%%/cmake/ZeekPluginCommon.cmake
 %%DATADIR%%/cmake/ZeekPluginDynamic.cmake
 %%DATADIR%%/cmake/ZeekPluginStatic.cmake
-%%DATADIR%%/cmake/ZeekSpicyAnalyzerSupport.cmake
+%%SPICY%%%%DATADIR%%/cmake/ZeekSpicyAnalyzerSupport.cmake
 %%DATADIR%%/cmake/ZeekSubdir.cmake
 %%DATADIR%%/cmake/cmake_uninstall.cmake.in
 %%DATADIR%%/cmake/package_postupgrade.sh.in