[patch] Patch that fixes build with slibtool.

freeradius-3.0.25.slibtool.patch (text/plain), 4.42 KB, created by orbea on 2022-05-06 21:39:33 UTC

    Fix build with slibtool

diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index 2ce0c18..7c7aaf7 100644
--- a/scripts/boiler.mk
+++ b/scripts/boiler.mk
@@ -368,6 +368,7 @@ define INCLUDE_SUBMAKEFILE
         ALL_TGTS += $${TGT}
         $${TGT}_LDFLAGS := $${TGT_LDFLAGS}
         $${TGT}_LDLIBS := $${TGT_LDLIBS}
+        $${TGT}_LTFLAGS := $${TGT_LTFLAGS}
         $${TGT}_LINKER := $${TGT_LINKER}
         $${TGT}_POSTMAKE := $${TGT_POSTMAKE}
         $${TGT}_POSTCLEAN := $${TGT_POSTCLEAN}
@@ -397,6 +398,7 @@ define INCLUDE_SUBMAKEFILE
         # as determined by which target is at the top of the stack.
         TGT := $$(strip $$(call PEEK,$${TGT_STACK}))
         $${TGT}_LDFLAGS   += $${TGT_LDFLAGS}
+        $${TGT}_LTFLAGS   += $${TGT_LTFLAGS}
         $${TGT}_LDLIBS    += $${TGT_LDLIBS}
         $${TGT}_POSTCLEAN += $${TGT_POSTCLEAN}
         $${TGT}_POSTMAKE  += $${TGT_POSTMAKE}
diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 57915e1..7108d80 100644
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -97,7 +97,7 @@ define ADD_TARGET_RULE.la
 	    $(Q)$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
 	    @$(ECHO) LINK $${${1}_BUILD}/${1}
 	    $(Q)$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \
-                $${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \
+                $${${1}_LDFLAGS} $${${1}_LTFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \
                 $${${1}_PRLIBS}
 	    $(Q)$${${1}_POSTMAKE}
 
@@ -135,7 +135,7 @@ define ADD_LOCAL_RULE.la
     $${${1}_BUILD}/$${${1}_LOCAL}: $${${1}_OBJS} $${${1}_LOCAL_PRLIBS}
 	    $(Q)$(strip mkdir -p $${${1}_BUILD}/${LOCAL}/)
 	    $(Q)$${${1}_LINKER} -o $${${1}_BUILD}/$${LOCAL}${1} $${LOCAL_FLAGS} $${LDFLAGS} \
-                $${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \
+                $${${1}_LDFLAGS} $${${1}_LTFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \
                 $${${1}_LOCAL_PRLIBS}
 	    $(Q)$${${1}_POSTMAKE}
 
diff --git a/src/lib/all.mk b/src/lib/all.mk
index 3580fdf..75f0234 100644
--- a/src/lib/all.mk
+++ b/src/lib/all.mk
@@ -50,3 +50,4 @@ SRC_CFLAGS	:= -D_LIBRADIUS -I$(top_builddir)/src
 # like pthread and the regexp libraries.
 TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS)
 TGT_LDFLAGS	:= $(LDFLAGS) $(PCAP_LDFLAGS)
+TGT_LTFLAGS	:=
diff --git a/src/main/libfreeradius-server.mk b/src/main/libfreeradius-server.mk
index 4495f72..4c46dae 100644
--- a/src/main/libfreeradius-server.mk
+++ b/src/main/libfreeradius-server.mk
@@ -18,5 +18,5 @@ SOURCES	:=	conffile.c \
 TGT_LDLIBS      := $(OPENSSL_LIBS)
 
 ifneq ($(MAKECMDGOALS),scan)
-SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
+SRC_CFLAGS$	+= -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\""
 endif
diff --git a/src/main/unittest.mk b/src/main/unittest.mk
index edd4f13..4c4fe88 100644
--- a/src/main/unittest.mk
+++ b/src/main/unittest.mk
@@ -21,5 +21,5 @@ TGT_PREREQS	+= libfreeradius-eap.a
 endif
 
 ifneq ($(MAKECMDGOALS),scan)
-SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\""
 endif
diff --git a/src/modules/all.mk b/src/modules/all.mk
index 9efba92..02c70ce 100644
--- a/src/modules/all.mk
+++ b/src/modules/all.mk
@@ -4,6 +4,11 @@
 #
 CFLAGS += -DIS_MODULE=1
 
+#
+#  Build these as modules
+#
+TGT_LTFLAGS := -module
+
 #
 #  If we haven't run configure, ignore the modules which require it.
 #  Otherwise, load in all of the module makefiles, including ones
diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk
index 6068f54..3c28264 100644
--- a/src/modules/rlm_eap/radeapclient.mk
+++ b/src/modules/rlm_eap/radeapclient.mk
@@ -23,7 +23,7 @@ SRC_CFLAGS += -DWITH_EAPCLIENT
 SRC_INCDIRS  := ${top_srcdir}/src/modules/rlm_eap/libeap
 
 ifneq ($(MAKECMDGOALS),scan)
-SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\""
 endif
 
 endif