diff options
| author | Richard PALO <richard@NetBSD.org> | 2015-09-15 15:58:51 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-10-20 15:17:58 +0000 |
| commit | fd612a144c0028972513a18167a13d29326a1798 (patch) | |
| tree | 66208cb56cc22e7d7b942f029a46f3213bb3a1a2 /libreofficekit | |
| parent | d42c3e0ddd9078c00de591b7470d73ad8a186cb1 (diff) | |
Add DLOPEN_LIBS to configure for some cases where -ldl is needed
use std::sqrt in vcldemo.cxx
Change-Id: I24d8ba15ee267d0cad3b063df9b7cfd8d284f4ee
Reviewed-on: https://gerrit.libreoffice.org/18591
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'libreofficekit')
| -rw-r--r-- | libreofficekit/Executable_gtktiledviewer.mk | 5 | ||||
| -rw-r--r-- | libreofficekit/Executable_tilebench.mk | 3 | ||||
| -rw-r--r-- | libreofficekit/Library_libreofficekitgtk.mk | 5 | ||||
| -rw-r--r-- | libreofficekit/Module_libreofficekit.mk | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/libreofficekit/Executable_gtktiledviewer.mk b/libreofficekit/Executable_gtktiledviewer.mk index 31028a67fafb..f6e297b5dbfe 100644 --- a/libreofficekit/Executable_gtktiledviewer.mk +++ b/libreofficekit/Executable_gtktiledviewer.mk @@ -38,10 +38,9 @@ $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ -lICE \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ )) endif diff --git a/libreofficekit/Executable_tilebench.mk b/libreofficekit/Executable_tilebench.mk index 11e73dead0bd..4da51d3ca686 100644 --- a/libreofficekit/Executable_tilebench.mk +++ b/libreofficekit/Executable_tilebench.mk @@ -20,8 +20,7 @@ $(eval $(call gb_Executable_use_libraries,tilebench,\ )) $(eval $(call gb_Executable_add_libs,tilebench,\ - -lm \ - -ldl \ + -lm $(DLOPEN_LIBS) \ -lpthread \ )) diff --git a/libreofficekit/Library_libreofficekitgtk.mk b/libreofficekit/Library_libreofficekitgtk.mk index 7d25abf944b1..3eba939ad56c 100644 --- a/libreofficekit/Library_libreofficekitgtk.mk +++ b/libreofficekit/Library_libreofficekitgtk.mk @@ -28,10 +28,9 @@ $(eval $(call gb_Library_add_libs,libreofficekitgtk,\ $(GTK3_LIBS) \ )) -ifeq ($(OS),LINUX) +ifeq ($(OS),$(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,libreofficekitgtk,\ - -ldl \ - -lm \ + $(DLOPEN_LIBS) -lm \ )) endif diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk index 0b2fd4ae103d..7d1c5ead764e 100644 --- a/libreofficekit/Module_libreofficekit.mk +++ b/libreofficekit/Module_libreofficekit.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libreofficekit)) -ifeq ($(OS),LINUX) +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\ CppunitTest_libreofficekit_tiledrendering \ @@ -23,6 +23,6 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\ )) endif # ($(ENABLE_GTK3),) -endif # ($(OS),LINUX) +endif # vim: set ts=4 sw=4 et: |