sal/osl/unx/system.c | 4 ++--
solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk | 8 +++++---
solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk | 13 +++++++++----
3 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 1c184292ad65907a5c19458ae4366c5af67d4828
Author: Robert Nagy <robert.n...@gmail.com>
Date: Wed Dec 21 15:15:36 2011 +0100
sync the gb_LinkTarget__command_dynamiclink function from unxgcc.mk
diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
index b9a47da..acebb04 100644
--- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
@@ -33,19 +33,19 @@ gb_STDLIBS := pthread
include $(GBUILDDIR)/platform/unxgcc.mk
-gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
-
define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
-mkdir -p $(dir $(1)) && \
+ mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir
$(1)).$(SOVERSION)) \
$(if
$(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat
$(extraobjectlist)`) \
@@ -56,4 +56,6 @@ mkdir -p $(dir $(1)) && \
$(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1))
endef
+gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
index 89724a6..5eaa617 100644
--- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
@@ -32,24 +32,29 @@ gb_STDLIBS := pthread
include $(GBUILDDIR)/platform/unxgcc.mk
-gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
-
define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
-mkdir -p $(dir $(1)) && \
+ mkdir -p $(dir $(1)) && \
$(gb_CXX) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
+ $(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir
$(1)).$(SOVERSION)) \
+ $(if
$(SOVERSIONSCRIPT),-Wl$(COMMA)--version-script=$(SOVERSIONSCRIPT))\
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat
$(extraobjectlist)`) \
-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group \
$(LIBS) \
$(subst -lpthread,$(PTHREAD_LIBS),$(patsubst
lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))))) \
- -o $(1))
+ -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)))
+ $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1))
endef
+gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
+
# vim: set noet sw=4:
commit 891d78eb4655f197877fe58c2c23c460e2a402c9
Author: Robert Nagy <robert.n...@gmail.com>
Date: Wed Dec 21 15:06:53 2011 +0100
use the internal gethostbyname_r() implementation on OpenBSD too
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index b74aff5..bf3e51e 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -33,7 +33,7 @@
static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
/* struct passwd differs on some platforms */
-#if defined(MACOSX) || defined(IOS)
+#if defined(MACOSX) || defined(IOS) || defined(OPENBSD)
extern int h_errno;
@@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct
hostent *result,
return res;
}
-#endif // OSX || IOS
+#endif // OSX || IOS || OPENBSD
#if defined(MACOSX)
/*
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
