D43874.id134279.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D43874.id134279.diff
View Options

	diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile
	--- a/stand/kboot/kboot/Makefile
	+++ b/stand/kboot/kboot/Makefile
	@@ -60,4 +60,11 @@
	DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}
	LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA} ${LIBKBOOT}

	+# Add our own lua bindings until they are universal
	+.if ${LOADER_INTERP} == "lua"
	+SRCS+= \
	+ lua_bindings.c
	+CFLAGS.lua_bindings.c+= -I${FLUASRC}/modules
	+.endif
	+
	.include <bsd.prog.mk>
	diff --git a/stand/kboot/kboot/lua_bindings.c b/stand/kboot/kboot/lua_bindings.c
	new file mode 100644
	--- /dev/null
	+++ b/stand/kboot/kboot/lua_bindings.c
	@@ -0,0 +1,19 @@
	+/*
	+ * Copyright (c) 2024 Netflix, Inc.
	+ *
	+ * SPDX-License-Identifier: BSD-2-Clause
	+ */
	+
	+#include "lua.h"
	+#include "lauxlib.h"
	+#include "lutils.h"
	+#include "lhash.h"
	+
	+static void
	+lua_hash_bindings(lua_State *L)
	+{
	+ luaL_requiref(L, "hash", luaopen_hash, 1);
	+ lua_pop(L, 1); /* Remove lib */
	+}
	+
	+LUA_COMPILE_SET(lua_hash_bindings);
	diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile
	--- a/stand/liblua/Makefile
	+++ b/stand/liblua/Makefile
	@@ -26,6 +26,7 @@
	SRCS+= gfx_utils.c

	.PATH: ${FLUASRC}/modules
	+SRCS+= lhash.c
	SRCS+= lfs.c

	WARNS?= 3
	@@ -36,6 +37,7 @@
	CFLAGS+= -I${BOOTSRC}/include -I${LIBLUASRC} -I${LUASRC} -I${LDRSRC}

	CFLAGS.gfx_utils.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite
	+CFLAGS.lhash.c+= -I${SRCTOP}/sys/crypto/sha2

	.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
	CFLAGS+= -fPIC