From b1141fa61073b3f24e1a3574afa55a954e5a153d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 25 Apr 2019 11:48:39 +0200 Subject: Cut down on -pthread/-lpthread proliferation Building against libstdc++ effectively always requires -pthread anyway (as various standard C++ headers require it, see the comment added to solenv/gbuild/platform/unxgcc.mk), so many explicit uses of -pthread/-lpthread can be removed. Doing a (partial) test build on Linux with Clang -stdlib=libc++ suggests that libc++ indeed doesn't need -pthread as libstdc++ does. The remaining uses of -pthread/-lpthread are mostly in configure.ac for the various BSDs (which somebody else might want to clean up now), and related to external projects. I tried to be careful to remove -pthread/-lpthread from makefiles only when C++ object files are involved (so -pthread will now be included on the link command line by default). Change-Id: I936e082839cb9a434bd273ce5a1f187a4245dfa1 Reviewed-on: https://gerrit.libreoffice.org/71291 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/Executable_icontest.mk | 1 - vcl/Executable_lo_kde5filepicker.mk | 1 - vcl/Executable_mtfdemo.mk | 1 - vcl/Executable_ui-previewer.mk | 1 - vcl/Executable_vcldemo.mk | 1 - vcl/Executable_visualbackendtest.mk | 1 - vcl/Library_desktop_detector.mk | 1 - vcl/Library_vcl.mk | 6 ------ vcl/Library_vclplug_gen.mk | 1 - vcl/Library_vclplug_gtk.mk | 1 - vcl/Library_vclplug_gtk3.mk | 1 - vcl/Library_vclplug_gtk3_kde5.mk | 1 - vcl/Library_vclplug_kde5.mk | 1 - vcl/Library_vclplug_qt5.mk | 1 - vcl/StaticLibrary_glxtest.mk | 1 - 15 files changed, 20 deletions(-) (limited to 'vcl') diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index b162800e72fd..6faf33703aa1 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Executable_use_static_libraries,icontest,\ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,icontest,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) diff --git a/vcl/Executable_lo_kde5filepicker.mk b/vcl/Executable_lo_kde5filepicker.mk index 2eee2cd8711b..f3e940953601 100644 --- a/vcl/Executable_lo_kde5filepicker.mk +++ b/vcl/Executable_lo_kde5filepicker.mk @@ -92,7 +92,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_libs,lo_kde5filepicker,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk index d637439a17ba..5c4c45165535 100644 --- a/vcl/Executable_mtfdemo.mk +++ b/vcl/Executable_mtfdemo.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Executable_use_static_libraries,mtfdemo,\ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,mtfdemo,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 0925e575ee67..cf6a2d3de6c7 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -37,7 +37,6 @@ $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,ui-previewer,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index 125a151dec99..55848b280339 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Executable_use_static_libraries,vcldemo,\ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,vcldemo,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) diff --git a/vcl/Executable_visualbackendtest.mk b/vcl/Executable_visualbackendtest.mk index 87044535f03e..41c641a5ff14 100644 --- a/vcl/Executable_visualbackendtest.mk +++ b/vcl/Executable_visualbackendtest.mk @@ -45,7 +45,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_libs,visualbackendtest,\ -lm \ -ldl \ - -lpthread \ -lX11 \ )) diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index 3edd0015e243..f28ff9078e64 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,desktop_detector,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e400051df526..1ebdafdf6b18 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -545,11 +545,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ freetype \ fontconfig \ )) -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Library_add_libs,vcl,\ - -lpthread \ -)) -endif else # ! DISABLE_GUI @@ -578,7 +573,6 @@ endif ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,vcl,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ -lXext \ )) diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index f9b73e637d03..8781324a6da6 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -145,7 +145,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_gen,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 67d405d4c8fa..360eabf46020 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -126,7 +126,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_gtk,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index cfb2f1b2d30b..a77f3b300ad6 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -116,7 +116,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gtk3_kde5.mk b/vcl/Library_vclplug_gtk3_kde5.mk index 20a8dc1ee228..e725e077f55e 100644 --- a/vcl/Library_vclplug_gtk3_kde5.mk +++ b/vcl/Library_vclplug_gtk3_kde5.mk @@ -124,7 +124,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_gtk3_kde5,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk index f011f397d7d3..e60ea79c1f5e 100644 --- a/vcl/Library_vclplug_kde5.mk +++ b/vcl/Library_vclplug_kde5.mk @@ -89,7 +89,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_kde5,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk index f7fbfd1cdbdb..8aead5fa60f6 100644 --- a/vcl/Library_vclplug_qt5.mk +++ b/vcl/Library_vclplug_qt5.mk @@ -114,7 +114,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,vclplug_qt5,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk index 227cbaa574c1..1a285875c828 100644 --- a/vcl/StaticLibrary_glxtest.mk +++ b/vcl/StaticLibrary_glxtest.mk @@ -31,7 +31,6 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\ $(eval $(call gb_StaticLibrary_add_libs,glxtest,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) -- cgit v1.2.3