From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 16 Sep 2022 13:44:59 +0000 (-0400)
Subject: move luajit definitions to one place
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3324f50c0017dad8a66733a20f97a7b1cff7f8a6;p=thirdparty%2Ffreeradius-server.git

move luajit definitions to one place

and only use the definitions if libfreeradius-lua is built.

Apparently on an Apple M1, adding the various pagesize options
results in an invalid Mach-O executable
---

diff --git a/src/bin/radiusd.mk b/src/bin/radiusd.mk
index 0dd3fc8d963..2d4321fc87b 100644
--- a/src/bin/radiusd.mk
+++ b/src/bin/radiusd.mk
@@ -1,7 +1,7 @@
 TARGET		:= radiusd$(E)
 SOURCES		:= \
-    			radiusd.c \
-    			radmin.c
+			radiusd.c \
+			radmin.c
 
 SRC_CFLAGS	:= $(LIBREADLINE_CFLAGS)
 
@@ -11,6 +11,4 @@ TGT_LDFLAGS	:= $(LDFLAGS) $(SYSTEMD_LDFLAGS) $(LIBREADLINE_LDFLAGS) $(GPERFTOOLS
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 
 # Flags needed when linking main executables that link against LuaJIT
-ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
-TGT_LDLIBS	+= -pagezero_size 10000 -image_base 100000000
-endif
+TGT_LDLIBS	+= $(LUAJIT_LDLIBS)
diff --git a/src/bin/unit_test_module.mk b/src/bin/unit_test_module.mk
index 0873ef1bac1..4ba60c56967 100644
--- a/src/bin/unit_test_module.mk
+++ b/src/bin/unit_test_module.mk
@@ -6,9 +6,7 @@ TGT_LDLIBS	:= $(LIBS) $(LCRYPT)
 TGT_PREREQS	:= $(LIBFREERADIUS_SERVER) libfreeradius-io$(L)
 
 # Flags needed when linking main executables that link against LuaJIT
-ifneq (,$(findstring darwin,$(TARGET_SYSTEM)))
-TGT_LDLIBS	+= -pagezero_size 10000 -image_base 100000000
-endif
+TGT_LDLIBS	+= $(LUAJIT_LDLIBS)
 
 # Libraries can't depend on libraries (oops), so make the binary
 # depend on the EAP code...
diff --git a/src/modules/rlm_lua/libfreeradius-lua.mk.in b/src/modules/rlm_lua/libfreeradius-lua.mk.in
index af6cc16ed5e..7d3bbaf8299 100644
--- a/src/modules/rlm_lua/libfreeradius-lua.mk.in
+++ b/src/modules/rlm_lua/libfreeradius-lua.mk.in
@@ -15,6 +15,13 @@ TARGETNAME	:= @targetname@
 
 ifneq "$(TARGETNAME)" ""
 TARGET		:= libfreeradius-lua$(L)
+
+#
+#  OSX requires some extra options. But ARM systems can't use them.
+#
+ifneq (,$(findstring x86_64-apple-darwin,$(TARGET_SYSTEM)))
+LUAJIT_LDLIBS	+= -pagezero_size 10000 -image_base 100000000
+endif
 endif
 
 SOURCES		:= util.c