[Libreoffice-commits] .: solenv/bin

[Robert Nagy]

 solenv/bin/concat-deps.c |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b23f2d78c4d3ca9a79027c6251f3933a85f88053
Author: Robert Nagy rob...@openbsd.org
Date:   Sun Dec 18 11:18:28 2011 +0100

use the same memory alignment for *BSD as on Linux

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index fc23433..a0eda43 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -36,7 +36,9 @@
 #define USE_MEMORY_ALIGNMENT 64 /* big value - no alignment */
 #endif /* Def __CYGWIN__ */
 
-#ifdef __linux
+#if defined(__linux) || defined(__OpenBSD__) || \
+defined(__FreeBSD__) || defined(__NetBSD__) || \
+defined(__DragonFly__)
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define CORE_BIG_ENDIAN 0
 #define CORE_LITTLE_ENDIAN 1
@@ -48,7 +50,7 @@
 #define USE_MEMORY_ALIGNMENT 4
 #endif /* __BYTE_ORDER == __BIG_ENDIAN */
 #endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */
-#endif /* Def __linux */
+#endif /* Def __linux || Def *BSD */
 
 #ifdef __sun
 #ifdef __sparc
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sal/osl solenv/gbuild

[Robert Nagy]

 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

[Libreoffice-commits] .: bridges/source configure.in set_soenv.in

[Robert Nagy]

 bridges/source/cpp_uno/shared/makefile.mk   |4 
 bridges/source/cpp_uno/shared/vtablefactory.cxx |8 
 configure.in|2 ++
 set_soenv.in|1 +
 4 files changed, 15 insertions(+)

New commits:
commit b8b22391ae7f87c8fb495a9e6839ed508fdaf932
Author: Robert Nagy robert.n...@gmail.com
Date:   Wed Dec 21 16:16:22 2011 +0100

only use posix_fallocate() if it's actually available

diff --git a/bridges/source/cpp_uno/shared/makefile.mk 
b/bridges/source/cpp_uno/shared/makefile.mk
index 4ce8122..c71ba6b 100644
--- a/bridges/source/cpp_uno/shared/makefile.mk
+++ b/bridges/source/cpp_uno/shared/makefile.mk
@@ -33,6 +33,10 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF $(HAVE_POSIX_FALLOCATE) == YES
+CDEFS += -DHAVE_POSIX_FALLOCATE
+.ENDIF
+
 SLOFILES = \
 $(SLO)$/bridge.obj \
 $(SLO)$/component.obj \
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx 
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index b049c7f..830d899 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -264,10 +264,18 @@ bool VtableFactory::createBlock(Block block, sal_Int32 
slotCount) const
 }
 unlink(tmpfname);
 delete[] tmpfname;
+#if defined(HAVE_POSIX_FALLOCATE)
 int err = posix_fallocate(block.fd, 0, block.size);
+#else
+int err = ftruncate(block.fd, block.size);
+#endif
 if (err != 0)
 {
+#if defined(HAVE_POSIX_FALLOCATE)
 SAL_WARN(bridges, posix_fallocate failed with code   err);
+#else
+SAL_WARN(bridges, truncation of executable memory area failed 
with code   err);
+#endif
 close(block.fd);
 block.fd = -1;
 break;
diff --git a/configure.in b/configure.in
index 49c9758..897403a 100644
--- a/configure.in
+++ b/configure.in
@@ -3879,6 +3879,8 @@ fi
 if test $with_alloc = internal -o -z $with_alloc; then
 AC_MSG_RESULT([internal])
 fi
+AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=YES, 
[HAVE_POSIX_FALLOCATE=NO])
+AC_SUBST(HAVE_POSIX_FALLOCATE)
 AC_SUBST(ALLOC)
 
 dnl ===
diff --git a/set_soenv.in b/set_soenv.in
index 06c8b30..b88c0cf 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1934,6 +1934,7 @@ ToFile( HUNSPELL_LIBS, @HUNSPELL_LIBS@,e );
 ToFile( SYSTEM_LPSOLVE,@SYSTEM_LPSOLVE@,   e );
 ToFile( HAVE_GETOPT,   @HAVE_GETOPT@,  e );
 ToFile( HAVE_READDIR_R,@HAVE_READDIR_R@,   e );
+ToFile( HAVE_POSIX_FALLOCATE,@HAVE_POSIX_FALLOCATE@,   e );
 ToFile( SYSTEM_LIBC,   @SYSTEM_LIBC@,  e );
 ToFile( SYSTEM_HYPH,   @SYSTEM_HYPH@,  e );
 ToFile( HYPHEN_LIB,@HYPHEN_LIB@,   e );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: download

[Robert Nagy]

 download |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bae6e3f4fe355d0018c77e68d19bc64b52fe1ba6
Author: Robert Nagy rob...@openbsd.org
Date:   Sun Mar 18 14:14:02 2012 +0100

use /usr/bin/env bash instead of /bin/bash

diff --git a/download b/download
index 89efbbe..e5aad88 100755
--- a/download
+++ b/download
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #*
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - bridges/source configure.in

[Robert Nagy]

 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |4 
 configure.in |   12 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 7c9e637bdebbc3688f3d321048f77b480b58dc24
Author: Robert Nagy rob...@openbsd.org
Date:   Thu Mar 29 23:47:07 2012 +0200

alloca(3) needs stdlib.h on *BSD because there is no alloca.h

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 4e74698..a9abb5c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -26,7 +26,11 @@
  *
  /
 
+#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || 
defined(DRAGONFLY)
+#include stdlib.h
+#else
 #include alloca.h
+#endif
 #include exception
 #include typeinfo
 
commit 7cce08194caf83703ae83bbbf6227237338e5447
Author: Robert Nagy rob...@openbsd.org
Date:   Thu Mar 29 23:43:47 2012 +0200

add $python_libs to PYTHON_LIBS in case pkg-config is being used

diff --git a/configure.in b/configure.in
index de7603f..fc743c8 100644
--- a/configure.in
+++ b/configure.in
@@ -6285,7 +6285,7 @@ if test $enable_python = system; then
 python_libdir=`$PYTHON -c import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('LIBDIR'));`
 if $PKG_CONFIG --exists python-$python_version; then
 PYTHON_CFLAGS=`$PKG_CONFIG --cflags python-$python_version`
-PYTHON_LIBS=`$PKG_CONFIG --libs python-$python_version`
+PYTHON_LIBS=`$PKG_CONFIG --libs python-$python_version` 
$python_libs
 else
 PYTHON_CFLAGS=-I$python_include
 PYTHON_LIBS=-L$python_libdir -lpython$python_version $python_libs
commit 72252bcab1acd94862a7004890a906621c4a08dd
Author: Robert Nagy rob...@openbsd.org
Date:   Thu Mar 29 23:41:26 2012 +0200

some systems use sha1 instead of sha1sum, so detect both of them

diff --git a/configure.in b/configure.in
index cd8aa6c..de7603f 100644
--- a/configure.in
+++ b/configure.in
@@ -3614,6 +3614,14 @@ AC_MSG_CHECKING([whether to enable pch feature])
 AC_MSG_RESULT([no, obsolete])
 
 dnl ===
+dnl Search all the common names for sha1sum
+dnl ===
+AC_PATH_PROGS(SHA1SUM, sha1sum sha1)
+if test -z $SHA1SUM; then
+AC_MSG_ERROR([install sha1sum to run this script])
+fi
+
+dnl ===
 dnl Search all the common names for GNU make
 dnl ===
 AC_MSG_CHECKING([for GNU make])
@@ -3669,7 +3677,7 @@ define d2
 endef
 
 %.b : %.a
-   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
\$(call d1,\$(CHECKSUM)),\
\$(call d2,\$(CHECKSUM)))
 EOF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits