bootstrap building with --disable-dynloading on standard linux

Change-Id: I5baf70f0053612cba8b74f54aff11ce25cdeb95a
Reviewed-on: https://gerrit.libreoffice.org/32202Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

codemaker/Executable_cppumaker.mk

@@ -12,9 +12,11 @@ $(eval $(call gb_Executable_Executable,cppumaker))
 $(eval $(call gb_Executable_use_external,cppumaker,boost_headers))
 
 $(eval $(call gb_Executable_use_libraries,cppumaker,\
-    sal \
-    salhelper \
     unoidl \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    salhelper \
+    sal \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,cppumaker,\

codemaker/Executable_javamaker.mk

@@ -12,9 +12,11 @@ $(eval $(call gb_Executable_Executable,javamaker))
 $(eval $(call gb_Executable_use_external,javamaker,boost_headers))
 
 $(eval $(call gb_Executable_use_libraries,javamaker,\
-    sal \
-    salhelper \
     unoidl \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    salhelper \
+    sal \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,javamaker,\

idlc/Executable_idlc.mk

@@ -21,6 +21,7 @@ $(eval $(call gb_Executable_use_externals,idlc,\
 
 $(eval $(call gb_Executable_use_libraries,idlc,\
     reg \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
     sal \
     salhelper \
 ))

registry/Executable_regmerge.mk

@@ -10,8 +10,10 @@
 $(eval $(call gb_Executable_Executable,regmerge))
 
 $(eval $(call gb_Executable_use_libraries,regmerge,\
-    sal \
     reg \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),salhelper) \
+    sal \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,regmerge,\

registry/Executable_regview.mk

@@ -15,8 +15,10 @@ $(eval $(call gb_Executable_set_include,regview, \
 ))
 
 $(eval $(call gb_Executable_use_libraries,regview,\
-    sal \
     reg \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),salhelper) \
+    sal \
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,regview,\

rsc/Executable_rsc.mk

@@ -23,10 +23,11 @@ $(eval $(call gb_Executable_add_defs,rsc,\
 ))
 
 $(eval $(call gb_Executable_use_libraries,rsc,\
-	i18nlangtag \
 	comphelper \
-	sal \
+	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),cppu) \
+	i18nlangtag \
 	tl \
+	sal \
 	$(gb_UWINAPI) \
 ))
 

sal/Module_sal.mk

@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-	$(if $(CROSS_COMPILING),,Executable_cppunittester) \
+	$(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \

solenv/gbuild/platform/linux.mk

@@ -17,4 +17,8 @@ gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs)
 
 include $(GBUILDDIR)/platform/unxgcc.mk
 
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+gb_STDLIBS := -lpthread -ldl
+endif
+
 # vim: set noet sw=4 ts=4:

solenv/gbuild/platform/unxgcc.mk

@@ -167,7 +167,8 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library,$(TARGETTYPE)),$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$(call gb_LinkTarget__command_staticlink,$(1)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
 endef
 

unoidl/Executable_unoidl-check.mk

@@ -14,9 +14,11 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-check, \
 ))
 
 $(eval $(call gb_Executable_use_libraries,unoidl-check, \
-    sal \
-    salhelper \
     unoidl \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    salhelper \
+    sal \
 ))
 
 # vim: set noet sw=4 ts=4:

unoidl/Executable_unoidl-read.mk

@@ -14,9 +14,11 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-read, \
 ))
 
 $(eval $(call gb_Executable_use_libraries,unoidl-read, \
-    sal \
-    salhelper \
     unoidl \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    salhelper \
+    sal \
 ))
 
 # vim: set noet sw=4 ts=4:

unoidl/Executable_unoidl-write.mk

@@ -14,9 +14,11 @@ $(eval $(call gb_Executable_add_exception_objects,unoidl-write, \
 ))
 
 $(eval $(call gb_Executable_use_libraries,unoidl-write, \
-    sal \
-    salhelper \
     unoidl \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),reg) \
+    $(if $(filter TRUE,$(DISABLE_DYNLOADING)),store) \
+    salhelper \
+    sal \
 ))
 
 # vim: set noet sw=4 ts=4: