fix macos build

Signed-off-by: Ricardo Dias <[email protected]>

Author: rjd15372

src/Makefile

@@ -265,7 +265,11 @@ endif
 ifeq ($(LUA_MODULE),$(LUA_MODULE_NAME))
 	current_dir = $(shell pwd)
 	FINAL_CFLAGS+=-DLUA_ENGINE_ENABLED -DLUA_ENGINE_LIB=libluaengine.so
+ifeq ($(uname_S),Darwin)
+	FINAL_LDFLAGS+= -Wl,-rpath,$(PREFIX)/lib:$(current_dir)/modules/lua
+else
 	FINAL_LDFLAGS+= -Wl,-rpath,$(PREFIX)/lib:$(current_dir)/modules/lua -Wl,--disable-new-dtags
+endif
 	LUA_MODULE_INSTALL=install-lua-module
 endif
 

src/eval.c

@@ -240,7 +240,7 @@ int evalExtractShebangFlags(sds body,
         }
 
         if (out_engine) {
-            uint32_t engine_name_len = sdslen(parts[0]) - 2;
+            size_t engine_name_len = sdslen(parts[0]) - 2;
             *out_engine = zcalloc(engine_name_len + 1);
             valkey_strlcpy(*out_engine, parts[0] + 2, engine_name_len + 1);
         }

src/modules/lua/Makefile

@@ -1,17 +1,39 @@
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
 DEPS_DIR=../../../deps
-CFLAGS= -I. -I$(DEPS_DIR)/lua/src -I$(DEPS_DIR)/fpconv -fPIC -W -Wall -fno-common $(OPTIMIZATION) -std=c99 -D_GNU_SOURCE
-SHOBJ_LDFLAGS= -shared
+
+ifeq ($(uname_S),Linux)
+	SHOBJ_CFLAGS= -I. -I$(DEPS_DIR)/lua/src -I$(DEPS_DIR)/fpconv -fPIC -W -Wall -fno-common $(OPTIMIZATION) -std=c99 -D_GNU_SOURCE $(CFLAGS)
+	SHOBJ_LDFLAGS= -shared
+else
+	SHOBJ_CFLAGS= -I. -I$(DEPS_DIR)/lua/src -I$(DEPS_DIR)/fpconv -fPIC -W -Wall -dynamic -fno-common $(OPTIMIZATION) -std=c99 -D_GNU_SOURCE $(CFLAGS)
+	SHOBJ_LDFLAGS= -bundle -undefined dynamic_lookup
+endif
+
 LIBS= $(DEPS_DIR)/lua/src/liblua.a $(DEPS_DIR)/fpconv/libfpconv.a
-SRCS = $(wildcard *.c)
-OBJS = $(SRCS:.c=.o)
+SRCS= $(wildcard *.c)
+OBJS= $(SRCS:.c=.o) sha1.o rand.o
+
+# OS X 11.x doesn't have /usr/lib/libSystem.dylib and needs an explicit setting.
+ifeq ($(uname_S),Darwin)
+ifeq ("$(wildcard /usr/lib/libSystem.dylib)","")
+	SHOBJ_LDFLAGS+= -L /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lsystem
+endif
+endif
 
 all: libluaengine.so
 
-libluaengine.so: $(LIBS) $(OBJS)
-	$(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS)
+libluaengine.so: $(OBJS) $(LIBS)
+	$(CC) -o $@ $(SHOBJ_LDFLAGS) $^
+
+sha1.o: ../../sha1.c
+	$(CC) $(SHOBJ_CFLAGS) -c $< -o $@
+
+rand.o: ../../rand.c
+	$(CC) $(SHOBJ_CFLAGS) -c $< -o $@
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(SHOBJ_CFLAGS) -c $< -o $@
 
 $(DEPS_DIR)/lua/src/liblua.a:
 	cd $(DEPS_DIR) && $(MAKE) lua

src/modules/lua/engine_lua.c

@@ -3,7 +3,9 @@
 #include <lauxlib.h>
 #include <lualib.h>
 #include <string.h>
+#if defined(__GLIBC__) && !defined(USE_LIBC)
 #include <malloc.h>
+#endif
 #include <errno.h>
 
 #include "engine_structs.h"
@@ -321,7 +323,7 @@ static void resetLuaContext(void *context) {
     lua_gc(lua, LUA_GCCOLLECT, 0);
     lua_close(lua);
 
-#if !defined(USE_LIBC)
+#if defined(__GLIBC__) && !defined(USE_LIBC)
     /* The lua interpreter may hold a lot of memory internally, and lua is
      * using libc. libc may take a bit longer to return the memory to the OS,
      * so after lua_close, we call malloc_trim try to purge it earlier.