avmedia/Library_avmediaogl.mk | 2 +-
chart2/Library_chartcore.mk | 4 ++--
chart2/Library_chartopengl.mk | 4 ++--
sd/Module_sd.mk | 2 +-
vcl/StaticLibrary_glxtest.mk | 3 +--
5 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 6ac9a4f0a36677216660b29e26ce99c3b0a51e36
Author: Baptiste Daroussin <b...@freebsd.org>
Date: Sat Dec 12 01:24:07 2015 +0100
Make .mk files more portable
Replace some -ldl by $(DLOPEN_LIBS)
Add some FREEBSD tests
Change-Id: Ic30fe29b938d877694db2927775f89de15c02d87
Reviewed-on: https://gerrit.libreoffice.org/20652
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Matúš Kukan <ma...@libreoffice.org>
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk
index d3f14f7..b7498bf 100644
--- a/avmedia/Library_avmediaogl.mk
+++ b/avmedia/Library_avmediaogl.mk
@@ -51,7 +51,7 @@ else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\
OpenGL \
))
-else ifeq ($(OS),LINUX)
+else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,avmediaogl,\
-lGL \
))
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index ce5e706..ce2043a 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -253,9 +253,9 @@ else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,chartcore,\
OpenGL \
))
-else ifeq ($(OS),LINUX)
+else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,chartcore,\
- -ldl \
+ $(DLOPEN_LIBS) \
-lGL \
-lX11 \
))
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 2ed86f0..95ea58d 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -65,9 +65,9 @@ else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\
OpenGL \
))
-else ifeq ($(OS),LINUX)
+else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,chartopengl,\
- -ldl \
+ $(DLOPEN_LIBS) \
-lGL \
-lX11 \
))
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 09b36b2..ae1a83f 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_l10n_targets,sd,\
UIConfig_simpress \
))
-ifneq ($(OS),DRAGONFLY)
+ifeq ($(filter DRAGONFLY FREEBSD,$(OS)),)
$(eval $(call gb_Module_add_check_targets,sd,\
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_sd_uimpress) \
diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk
index 6e90b24..227cbaa 100644
--- a/vcl/StaticLibrary_glxtest.mk
+++ b/vcl/StaticLibrary_glxtest.mk
@@ -30,8 +30,7 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\
))
$(eval $(call gb_StaticLibrary_add_libs,glxtest,\
- -lm \
- -ldl \
+ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
