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