[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2022-10-19 Thread Stephan Bergmann (via logerrit) 
 configure.ac|4 ++--
 solenv/gbuild/platform/com_MSC_class.mk |3 ++-
 solenv/gbuild/platform/com_MSC_defs.mk  |4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit e74d0f01504c61917d8ff9e7538a0017b6212ff5
Author: Stephan Bergmann 
AuthorDate: Wed Oct 19 10:18:07 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 19 13:07:38 2022 +0200

Make MSVC -showIncludes processing more reliable

With the Windows display language set to "Portuguès (Brasil)" (and the
corresponding Visual Studio language pack installed), configure.ac detected
SHOWINCLUDES_PREFIX to have the value "Observação: incluindo arquivo:" in 
UTF-8
(i.e., with bytes ... C3 A7 C3 A3 ...).  However, for whatever reason
filter-showIncludes.awk apparently didn't manage to match the input it 
receives
against the value of that environment variable, and the Cygwin terminal
contained output lines starting with either

> Observa□ao: incluindo arquivo:

(with toplevel plain `make`, plain `make` in a module, and `make -O` in a
module) or

> Observaçao: incluindo arquivo:

(with toplevel `make -O`).  (Note how "ç" is either garbled as "□" or shown
correctly, and "ã" is always shown as plain "a".)  It's not quite clear to 
me
where exactly this garbling happens, and why the behavior is apparently
different in configure.ac vs. make.

The most reliable way to avoid these issues altogether is to force MSVC to 
emit
English diagnostics, via VSLANG=1033, as explained at

.
(I didn't find any official documentation of that environment variable on 
MSDN
though.  Thanks to Mike Kaganski for providing that Stack Overflow link.)

dfbce2a556972f552d194d2358c170077915d776 "gbuild: try to run
filter-showIncludes.awk in C locale" had started to call that AWK script 
with
LC_ALL=C (and subsequent commits had copied that LC_ALL=C in calls to 
similar
AWK scripts).  But that appears to neither be sufficient (see above) nor
necessary now, so I removed all those LC_ALL=C settings.  (There is a gawk
--characters-as-bytes option, but trying that out didn't make a difference 
for
this issue.)

clang-cl doesn't support VSLANG, nor does it generate localized diagnostics 
in
the first place, but lets consistently add VSLANG=1033 when determining
LO_CLANG_SHOWINCLUDES_PREFIX in configure.ac, too.  (The way VSLANG=1033 is 
set
in gb_CObject__compiler in com_MSC_class.mk, it affects all kinds of MSVC 
and
clang-cl invocations, whether or not they actually honour that environment
variable.)

Change-Id: I52d0e842d200ed256a44d6cc5de1b3868c0acc71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141524
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index ad617bee1221..259001e70b65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4469,7 +4469,7 @@ if test "$_os" = WINNT; then
 dnl localized
 AC_MSG_CHECKING([the dependency generation prefix (cl.exe -showIncludes)])
 echo "#include " > conftest.c
-SHOWINCLUDES_PREFIX=`$CC $CFLAGS -c -showIncludes conftest.c 2>/dev/null | 
\
+SHOWINCLUDES_PREFIX=`VSLANG=1033 $CC $CFLAGS -c -showIncludes conftest.c 
2>/dev/null | \
 grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
 rm -f conftest.c conftest.obj
 if test -z "$SHOWINCLUDES_PREFIX"; then
@@ -12240,7 +12240,7 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != 
TRUE; then
 
 AC_MSG_CHECKING([the dependency generation prefix (clang.exe 
-showIncludes)])
 echo "#include " > conftest.c
-LO_CLANG_SHOWINCLUDES_PREFIX=`$LO_CLANG_CC $CFLAGS -c 
-showIncludes conftest.c 2>/dev/null | \
+LO_CLANG_SHOWINCLUDES_PREFIX=`VSLANG=1033 $LO_CLANG_CC $CFLAGS -c 
-showIncludes conftest.c 2>/dev/null | \
 grep 'stdlib\.h' | head -n1 | sed 's/ [[[:alpha:]]]:.*//'`
 rm -f conftest.c conftest.obj
 if test -z "$LO_CLANG_SHOWINCLUDES_PREFIX"; then
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 06d21ecd474a..f1affe79e905 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -36,6 +36,7 @@ endef
 
 # $(call gb_CObject__compiler,flags,source,compiler)
 define gb_CObject__compiler
+   VSLANG=1033 \
$(if $(filter YES,$(LIBRARY_X64)), $(CXX_X64_BINARY), \
$(if $(filter YES,$(PE_X86)), $(CXX_X86_BINARY), \
$(if $(filter %.c,$(2)), \
@@ -291,7 +292,7 @@ $(call gb_Helper_abbreviate_dirs,\
-manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest \
-pdb:$(call

[Libreoffice-commits] core.git: configure.ac solenv/gbuild vcl/Library_vcl.mk

2022-02-20 Thread Jan-Marek Glogowski (via logerrit) 
 configure.ac   |   12 
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk |2 +-
 vcl/Library_vcl.mk |   16 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit ac65b4bb7a75ec71294a527bc4139356fcbf0929
Author: Jan-Marek Glogowski 
AuthorDate: Sun Feb 20 18:15:10 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sun Feb 20 20:12:07 2022 +0100

WASM depend on Emscripten 3.1.3 for native EH

This reverts the special SjLj handling introduced in commit
ae22f7d06246ee21f9c8e9f35f4477e88843c58b ("WASM add option to
build with native exceptions"). This is supposed to work now;
at least it compiles.

Change-Id: I5ebceea9c7fe3c982d7c9a8818fd79f2018f03cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130219
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/configure.ac b/configure.ac
index 6d81302b9e7e..af1da0103177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3073,7 +3073,19 @@ if test "$enable_wasm_strip" = "yes"; then
 AC_DEFINE(ENABLE_WASM_STRIP_SWEXPORTS)
 fi
 
+EMSCRIPTEN_NEH_MAJOR=3
+EMSCRIPTEN_NEH_MINOR=1
+EMSCRIPTEN_NEH_TINY=3
+EMSCRIPTEN_NEH_VERSION="${EMSCRIPTEN_NEH_MAJOR}.${EMSCRIPTEN_NEH_MINOR}.${EMSCRIPTEN_NEH_TINY}"
+
 if test "$enable_wasm_exceptions" = yes; then
+AC_MSG_CHECKING([if Emscripten version is at least $EMSCRIPTEN_NEH_VERSION 
for SjLj + native EH])
+check_semantic_version_three_prefixed EMSCRIPTEN NEH
+if test $? -ne 0; then
+AC_MSG_ERROR([no, found $EMSCRIPTEN_VERSION])
+else
+AC_MSG_RESULT([yes ($EMSCRIPTEN_VERSION)])
+fi
 ENABLE_WASM_EXCEPTIONS=TRUE
 fi
 AC_SUBST(ENABLE_WASM_EXCEPTIONS)
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk 
b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index a0ba51da2e4f..83e850a95f9f 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -32,7 +32,7 @@ gb_EMSCRIPTEN_QTDEFS := -DQT_NO_LINKED_LIST 
-DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO
 
 gb_Executable_EXT := .html
 ifeq ($(ENABLE_WASM_EXCEPTIONS),TRUE)
-gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions
+gb_EMSCRIPTEN_EXCEPT = -fwasm-exceptions -s SUPPORT_LONGJMP=wasm
 else
 gb_EMSCRIPTEN_EXCEPT = -s DISABLE_EXCEPTION_CATCHING=0
 endif
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9182f223eb93..d580ff3d2f6a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -94,20 +94,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
 mdds_headers \
 ))
 
-# WASM LLVM doesn't support native EH + SjLj (setjump / longjump) used by 
libjpeg / libpng.
-# This otherwise breaks the PCH generation, so just move the files for that 
case.
-ifeq (EMSCRIPTEN_TRUE,$(OS)_$(ENABLE_WASM_EXCEPTIONS))
-$(eval $(call gb_Library_add_cxxobjects,vcl,\
-vcl/source/filter/jpeg/jpegc \
-vcl/source/filter/png/PngImageReader \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,vcl,\
-vcl/source/filter/jpeg/jpegc \
-vcl/source/filter/png/PngImageReader \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/rendercontext/drawmode \
 vcl/skia/SkiaHelper \
@@ -474,6 +460,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/filter/ixpm/xpmread \
 vcl/source/filter/jpeg/Exif \
 vcl/source/filter/jpeg/jpeg \
+vcl/source/filter/jpeg/jpegc \
 vcl/source/filter/jpeg/JpegReader \
 vcl/source/filter/jpeg/JpegWriter \
 vcl/source/filter/jpeg/JpegTransform \
@@ -484,6 +471,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/filter/wmf/wmf \
 vcl/source/filter/wmf/wmfexternal \
 vcl/source/filter/wmf/wmfwr \
+vcl/source/filter/png/PngImageReader \
 vcl/source/filter/png/pngwrite \
 vcl/source/filter/webp/reader \
 vcl/source/filter/webp/writer \

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2020-09-24 Thread Tor Lillqvist (via logerrit) 
 configure.ac   |   17 -
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 2 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 03d5167455a5cbadfad9a2d5989574b1d1929857
Author: Tor Lillqvist 
AuthorDate: Thu Sep 24 19:42:14 2020 +0100
Commit: Tor Lillqvist 
CommitDate: Thu Sep 24 22:36:22 2020 +0200

Use -flto=thin in gb_LTOFLAGS for Apple's Clang (for macOS and iOS)

Don't add any LTO flags into $CC and $CXX as we don't do that for
other platforms either. But maybe we should? Currently, with the
separate gb_LTOFLAGS, we have to handle each external project
separately to make it build with LTO.

Change-Id: I9761426585ebdfd976c74168218bd26bcc0e8517
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103351
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 11f1bc87e4ae..1ea6b255bb23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3001,9 +3001,6 @@ if test $_os = Darwin; then
 INSTALL_NAME_TOOL=install_name_tool
 if test -z "$save_CC"; then
 stdlib=-stdlib=libc++
-if test "$ENABLE_LTO" = TRUE; then
-lto=-flto
-fi
 
 AC_MSG_CHECKING([what C compiler to use])
 CC="`xcrun -find clang`"
@@ -3013,7 +3010,7 @@ if test $_os = Darwin; then
 else
 CC+=" -target arm64-apple-macos"
 fi
-CC+=" $lto -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
+CC+=" -mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
 AC_MSG_RESULT([$CC])
 
 AC_MSG_CHECKING([what C++ compiler to use])
@@ -3024,7 +3021,7 @@ if test $_os = Darwin; then
 else
 CXX+=" -target arm64-apple-macos"
 fi
-CXX+=" $lto $stdlib 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CXX+=" $stdlib -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
 AC_MSG_RESULT([$CXX])
 
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
@@ -3193,24 +3190,18 @@ if test $_os = iOS; then
 
 AC_MSG_RESULT($sysroot)
 
-# LTO is not really recommended for iOS builds,
-# the link time will be astronomical
-if test "$ENABLE_LTO" = TRUE; then
-lto=-flto
-fi
-
 stdlib="-stdlib=libc++"
 
 AC_MSG_CHECKING([what C compiler to use])
 CC="`xcrun -find clang`"
 CC_BASE=`first_arg_basename "$CC"`
-CC+=" -arch $host_cpu_for_clang -isysroot $sysroot $lto $versionmin"
+CC+=" -arch $host_cpu_for_clang -isysroot $sysroot $versionmin"
 AC_MSG_RESULT([$CC])
 
 AC_MSG_CHECKING([what C++ compiler to use])
 CXX="`xcrun -find clang++`"
 CXX_BASE=`first_arg_basename "$CXX"`
-CXX+=" -arch $host_cpu_for_clang $stdlib -isysroot $sysroot $lto 
$versionmin"
+CXX+=" -arch $host_cpu_for_clang $stdlib -isysroot $sysroot $versionmin"
 AC_MSG_RESULT([$CXX])
 
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 0480b0fc3fd5..047f121106de 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -177,8 +177,12 @@ gb_CFLAGS_COMMON += -std=gnu89
 
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_IS_CLANG),TRUE)
+ifneq (,$(index,iOS MACOSX,$(OS)))
+gb_LTOFLAGS := -flto=thin
+else
 gb_LTOFLAGS := -flto
 gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
+endif
 else
 gb_LTOFLAGS := -flto$(if $(filter-out 0,$(PARALLELISM)),=$(PARALLELISM)) 
-fuse-linker-plugin -O2
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2020-09-16 Thread Jan-Marek Glogowski (via logerrit) 
 configure.ac|   14 +-
 solenv/gbuild/platform/WNT_ARM64_MSC.mk |   27 +++
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 solenv/gbuild/platform/windows.mk   |1 +
 4 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 03ce1e85428d4a273910bf7ca758ce050e95720c
Author: Jan-Marek Glogowski 
AuthorDate: Fri Jul 17 23:17:37 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Sep 16 23:56:21 2020 +0200

configure + gbuild: handle Windows Arm64

Change-Id: Idfc20c1234d693d6b402158b8bc782bd17cd3f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102850
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/configure.ac b/configure.ac
index 5acf53a3601c..be73281b3e05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3390,6 +3390,16 @@ cygwin*)
 WIN_HOST_BITS=32
 WIN_OTHER_ARCH="x64"
 ;;
+aarch64)
+CPUNAME=ARM64
+RTL_ARCH=arm64
+PLATFORMID=windows_arm64
+WINDOWS_X64=1
+SCPDEFS="$SCPDEFS -DWINDOWS_ARM64"
+WIN_HOST_ARCH="arm64"
+WIN_HOST_BITS=64
+with_ucrt_dir=no
+;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
@@ -3398,6 +3408,7 @@ cygwin*)
 case "$build_cpu" in
 x86_64) WIN_BUILD_ARCH="x64" ;;
 i*86) WIN_BUILD_ARCH="x86" ;;
+aarch64) WIN_BUILD_ARCH="arm64" ;;
 *)
 AC_MSG_ERROR([Unsupported build_cpu $build_cpu for host_os $host_os])
 ;;
@@ -3792,7 +3803,7 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([not found])
 AC_MSG_WARN([Installation set will not contain 64-bit Explorer 
extensions])
 fi
-else
+elif test "$WIN_HOST_ARCH" = "x64"; then
 CXX_X64_BINARY=$CXX
 fi
 AC_SUBST(BUILD_X64)
@@ -10901,6 +10912,7 @@ if test "$_os" = "WINNT"; then
 case "$WIN_HOST_ARCH" in
 x86) assembler=ml.exe ;;
 x64) assembler=ml64.exe ;;
+arm64) assembler=armasm64.exe ;;
 esac
 
 AC_MSG_CHECKING([for the MSVC assembler ($assembler)])
diff --git a/solenv/gbuild/platform/WNT_ARM64_MSC.mk 
b/solenv/gbuild/platform/WNT_ARM64_MSC.mk
new file mode 100644
index ..67e1d5736736
--- /dev/null
+++ b/solenv/gbuild/platform/WNT_ARM64_MSC.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+gb_CPPU_ENV := msca
+gb_CPUDEFS := -D_ARM64_=1
+
+include $(GBUILDDIR)/platform/com_MSC_defs.mk
+
+include $(GBUILDDIR)/platform/com_MSC_class.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index c27fc0c95446..d69f7f46004d 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -189,7 +189,7 @@ cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' > 
$${RESPONSEFILE}.1 && \
 mv $${RESPONSEFILE}.1 $${RESPONSEFILE} &&
 endef
 
-MSC_SUBSYSTEM_VERSION=$(COMMA)6.01
+MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter ARM64,$(CPUNAME)),6.02,6.01)
 
 # the sort on the libraries is used to filter out duplicates to keep 
commandline
 # length in check - otherwise the dupes easily hit the limit when linking 
mergedlib
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index e30c5ad54455..14763e6dd4ea 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -47,6 +47,7 @@ gb_MSBUILD_CONFIG := $(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)
 gb_MSBUILD_PLATFORM := $(strip \
$(if $(filter INTEL,$(CPUNAME)),Win32) \
$(if $(filter X86_64,$(CPUNAME)),x64) \
+   $(if $(filter ARM64,$(CPUNAME)),ARM64) \
)
 gb_MSBUILD_CONFIG_AND_PLATFORM := \
/p:Configuration=$(gb_MSBUILD_CONFIG) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2020-07-29 Thread miki (via logerrit) 
 configure.ac  |5 +
 solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk |   14 ++
 2 files changed, 19 insertions(+)

New commits:
commit d76ac8dd74d7c642d90dc5ac861f048becb902be
Author: miki 
AuthorDate: Thu Apr 9 15:32:48 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jul 29 21:30:23 2020 +0200

Port to FreeBSD aarch64

Change-Id: Ib18894db8c2943dd1502c96951545bb75a1944eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91978
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 7bbb44e5ab60..59ec7ec58bf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4424,6 +4424,11 @@ freebsd*)
 P_SEP=:
 
 case "$host_cpu" in
+aarch64)
+CPUNAME=AARCH64
+PLATFORMID=freebsd_aarch64
+RTL_ARCH=AARCH64
+;;
 i*86)
 CPUNAME=INTEL
 RTL_ARCH=x86
diff --git a/solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk 
b/solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk
new file mode 100644
index ..6199f17b3015
--- /dev/null
+++ b/solenv/gbuild/platform/FREEBSD_AARCH64_GCC.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+#please make generic modifications to unxgcc.mk
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2020-06-19 Thread Stephan Bergmann (via logerrit) 
 configure.ac|3 +++
 solenv/gbuild/gbuild.mk |7 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 2f00ece21d4d51b553fd905b9a2e8eed12adf195
Author: Stephan Bergmann 
AuthorDate: Fri Jun 19 15:33:04 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 19 17:02:55 2020 +0200

Make --enable-sal-log orthogonal to --enable-debug

...for consistency with other options like --enable-assert-always-abort

Change-Id: I3734485e03203aaee065e1435dfd33f980b1b5eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96736
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 553402e33515..ccc9c07b21cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4146,6 +4146,9 @@ printf ("hello world\n");
 fi
 AC_SUBST(ENABLE_GDB_INDEX)
 
+if test -z "$enable_sal_log" && test "$ENABLE_DEBUG" = TRUE; then
+enable_sal_log=yes
+fi
 if test "$enable_sal_log" = yes; then
 ENABLE_SAL_LOG=TRUE
 fi
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 97d2879dcc9b..64ca8184e2fa 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -235,18 +235,13 @@ gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
-ifeq ($(gb_DEBUGLEVEL),0)
-
 ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 -DSAL_LOG_WARN \
 
 endif
 
-else
-gb_GLOBALDEFS += -DSAL_LOG_INFO \
--DSAL_LOG_WARN \
-
+ifneq ($(gb_DEBUGLEVEL),0)
 ifneq ($(gb_DEBUGLEVEL),1) # 2 or more
 gb_GLOBALDEFS += -DDEBUG \
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2020-03-23 Thread Michael Stahl (via logerrit) 
 configure.ac|8 ++--
 solenv/gbuild/platform/com_GCC_class.mk |2 +-
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 190f81e34d918da289310a90416f9b6b7be7295f
Author: Michael Stahl 
AuthorDate: Mon Mar 23 11:32:36 2020 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 23 14:07:01 2020 +0100

configure,gbuild: gla11y fails on Fedora 31

The problem is that the LD_LIBRARY_PATH on the command line causes
/usr/bin/python to find LO's libpython*.so*:

 18269: find library=libpython3.7m.so.1.0 [0]; searching
 18269:  search path=.../instdir/program
(LD_LIBRARY_PATH)
 18269:   trying file=.../instdir/program/libpython3.7m.so.1.0

Presumably LD_LIBRARY_PATH is used to find bundled libxml/libxslt.

So let's try to disable the broken case where a bundled lxml is used
with system python and bundled libxml/libxslt; this cannot work.

(regression from 84ef6d82546b044990f4efd57e51e29c6c6565c8)

Change-Id: I67aa8250691cae8f899d65f674aa9da23a9d1d7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90906
Reviewed-by: Samuel Thibault 
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 57caa0d9ae6b..1cf56da09c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8951,8 +8951,12 @@ if test "$with_lxml" != no; then
 ;;
 *)
 if test "$cross_compiling" != yes -a 
"x$ac_cv_header_Python_h" = "xyes"; then
-BUILD_TYPE="$BUILD_TYPE LXML"
-AC_MSG_RESULT([no, using internal lxml])
+if test -n ${SYSTEM_LIBXSLT} -o -n ${SYSTEM_LIBXML}; 
then
+AC_MSG_RESULT([no, and no system libxml/libxslt, 
gla11y will only report widget classes and ids])
+else
+BUILD_TYPE="$BUILD_TYPE LXML"
+AC_MSG_RESULT([no, using internal lxml])
+fi
 else
 AC_MSG_RESULT([no, and system does not provide python 
development headers, gla11y will only report widget classes and ids])
 fi
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index d113b8651156..29de22fe8634 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -215,7 +215,7 @@ endef
 
 define gb_UIConfig__gla11y_command
 $(call gb_Helper_abbreviate_dirs,\
-   $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \
+   $(gb_UIConfig_LXML_PATH) $(if 
$(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
$(call gb_ExternalExecutable_get_command,python) \
$(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ 
$(UIFILES)
 )
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 83f6553a518c..66333804ab51 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -654,7 +654,7 @@ define gb_UIConfig__gla11y_command
 $(call gb_ExternalExecutale__check_registration,python)
 $(call gb_Helper_abbreviate_dirs,\
FILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \
-   $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \
+   $(gb_UIConfig_LXML_PATH) $(if 
$(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \
$(call gb_ExternalExecutable_get_command,python) \
$(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L 
$$FILES
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2018-09-05 Thread Libreoffice Gerrit user 
 configure.ac   |   12 
 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 62bfe29f9045127d479c42376f599ddfb0fbb2ca
Author: Stephan Bergmann 
AuthorDate: Thu Aug 30 18:39:04 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 5 14:36:33 2018 +0200

Already set MSVC's -std:c++17 during the configure.ac feature checks

For cl version 19.15.26726 (VS 2017 15.8.1) that would detect
HAVE_CPP_GUARANTEED_COPY_ELISION, but wrongly so as it turns out.  :(

The compiler has C++20's __cpp_guaranteed_copy_elision feature-test macro
defined (and  claims 
that
C++17 "Guaranteed copy elision" is supported in "MSVC 19.13", aka VS 2017 
15.6).
But the build then failed at

> [build CXX] sw/source/uibase/app/docsh2.cxx
[...]
> C:/lo/core/sw/source/uibase/app/docsh2.cxx(427): error C2248: 
'editeng::SortedAutoCompleteStrings::SortedAutoCompleteStrings': cannot access 
private member declared in class 'editeng::SortedAutoCompleteStrings'
> C:\lo\core\include\editeng/swafopt.hxx(66): note: see declaration of 
'editeng::SortedAutoCompleteStrings::SortedAutoCompleteStrings'
> C:\lo\core\include\editeng/swafopt.hxx(55): note: see declaration of 
'editeng::SortedAutoCompleteStrings'

due to enabling the HAVE_CPP_GUARANTEED_COPY_ELISION-conditional code in
include/editeng/swafopt.hxx.

(And while my VS 15.8.1 stopped detecting HAVE_CPP_GUARANTEED_COPY_ELISION 
then,
, reportedly done with
15.7.4 aka 15.7.27703.2035, still mis-detected it and then failed at
sw/source/uibase/app/docsh2.cxx(427) as above, so needed a tweak to the 
check in
configure.ac.)

Change-Id: Ie14d74f3f795d819047deaafdb1e644ed00ee406
Reviewed-on: https://gerrit.libreoffice.org/59835
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 0e9d452ca591..ebf8b01ac657 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6181,7 +6181,7 @@ CXXFLAGS_CXX11=
 if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
 AC_MSG_CHECKING([whether $CXX supports C++11])
 AC_MSG_RESULT(yes)
-# MSVC supports (a subset of) CXX11 without any switch
+CXXFLAGS_CXX11=-std:c++17
 elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 HAVE_CXX11=
 AC_MSG_CHECKING([whether $CXX supports C++17, C++14, or C++11])
@@ -6413,14 +6413,18 @@ AC_LANG_PUSH([C++])
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#if !defined __cpp_guaranteed_copy_elision
+// At least VS 2017 15.8.1 defines __cpp_guaranteed_copy_elision as 
201606L without actually
+// supporting it:
+#if !defined __cpp_guaranteed_copy_elision || (defined _MSC_VER && 
!defined __clang__)
 struct S {
 private:
 S(S const &);
 public:
-S copy() const { return *this; }
+S();
+~S();
 };
-void f(S & s) { S c(s.copy()); }
+S copy();
+void f() { S c(copy()); }
 #endif
 ])], [
 AC_DEFINE([HAVE_CPP_GUARANTEED_COPY_ELISION],[1])
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 3791ccac65d6..252690c8c0a8 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -167,7 +167,7 @@ endif
 
 gb_CXXFLAGS := \
-utf-8 \
-   -std:c++17 \
+   $(CXXFLAGS_CXX11) \
-Gd \
-GR \
-Gs \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2018-08-31 Thread Libreoffice Gerrit user 
 configure.ac|9 -
 solenv/gbuild/gbuild.mk |4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 98ad9ec18ee63d6b97b4b90917113656450b81fd
Author: Stephan Bergmann 
AuthorDate: Fri Aug 31 12:07:52 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Aug 31 14:27:23 2018 +0200

Make --enable-assert-always-abort orthogonal of --enable-debug/dbgutil

(and keep enabled by default iff --enable-debug/dbgutil)

Change-Id: I962230b4c6623220603cb713c787c69274f63a8f
Reviewed-on: https://gerrit.libreoffice.org/59859
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index f4f7303c0146..756261a4f052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4639,7 +4639,14 @@ AC_SUBST(ENABLE_WERROR)
 dnl Check for --enable-assert-always-abort, set ASSERT_ALWAYS_ABORT
 dnl ===
 AC_MSG_CHECKING([whether to have assert() failures abort even without 
--enable-debug])
-if test -n "$enable_assert_always_abort" -a "$enable_assert_always_abort" = 
"yes"; then
+if test -z "$enable_assert_always_abort"; then
+   if test "$ENABLE_DEBUG" = TRUE; then
+   enable_assert_always_abort=yes
+   else
+   enable_assert_always_abort=no
+   fi
+fi
+if test "$enable_assert_always_abort" = "yes"; then
 ASSERT_ALWAYS_ABORT="TRUE"
 AC_MSG_RESULT([yes])
 else
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a67780a2cef8..522183ed9ffc 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -204,13 +204,13 @@ gb_GLOBALDEFS += -DTIMELOG \
 
 endif
 
-ifeq ($(gb_DEBUGLEVEL),0)
-
 ifeq ($(strip $(ASSERT_ALWAYS_ABORT)),FALSE)
 gb_GLOBALDEFS += -DNDEBUG \
 
 endif
 
+ifeq ($(gb_DEBUGLEVEL),0)
+
 ifeq ($(ENABLE_SAL_LOG),TRUE)
 gb_GLOBALDEFS += -DSAL_LOG_INFO \
 -DSAL_LOG_WARN \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2018-02-22 Thread Samuel Thibault 
 configure.ac  |2 +-
 solenv/gbuild/UIConfig.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a9f851e54f416820c61baf8caa79e4d91c8c61f
Author: Samuel Thibault 
Date:   Wed Feb 21 10:45:02 2018 +0100

gla11y: Use python interpreter decided by configure

configure uses $PYTHON to determine lxml availability, so the make rule
should use the same instead of letting gla11y find a python interpreter
through "env", in case e.g. $PYTHON is python3, and lxml is available in
python3 but not in python (actually python2).

Along the way, rather use PYTHON_FOR_BUILD for coherency.

Change-Id: Ied4c05aca462cc16685c61f36b56bb9e8612d90e
Reviewed-on: https://gerrit.libreoffice.org/50087
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 58451b4912c7..8b624c3ded46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8154,7 +8154,7 @@ system)
 SYSTEM_PYTHON=TRUE
 
 AC_MSG_CHECKING([for python lxml])
-if $PYTHON -c "import lxml.etree as ET" ; then
+if $PYTHON_FOR_BUILD -c "import lxml.etree as ET" ; then
 PYTHON_LXML=TRUE
 AC_MSG_RESULT([yes])
 else
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index fb8762e8a09c..9665dcaf9d18 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -94,7 +94,7 @@ endef
 # * UIConfig/ containing all nontranslatable files
 
 gb_UIConfig_INSTDIR := $(LIBO_SHARE_FOLDER)/config/soffice.cfg
-gb_UIConfig_a11yerrors_COMMAND = $(SRCDIR)/bin/gla11y
+gb_UIConfig_a11yerrors_COMMAND = $(PYTHON_FOR_BUILD) $(SRCDIR)/bin/gla11y
 
 $(dir $(call gb_UIConfig_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2016-07-21 Thread Michael Stahl 
 configure.ac|   12 
 solenv/gbuild/platform/com_GCC_class.mk |1 +
 solenv/gbuild/platform/com_GCC_defs.mk  |6 --
 3 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit beccfd1f8d87ae2196815d5a760054312e8e1c38
Author: Michael Stahl 
Date:   Wed Jul 20 17:29:17 2016 +0200

gbuild: always set CCACHE_CPP2=1 when COM_IS_CLANG

There are not only spurious warnings from loplugin, but also from plain
clang, at least with the Fedora 24 version.  So let's just try to always
set CCACHE_CPP2=1.

This should make the configure check for that obsolete.  The check didn't
do anything on Fedora anyway because it sets up ccache by putting
wrappers like /usr/lib64/ccache/clang on PATH.

Change-Id: Ieb17be4a1b1fd0f7aedb16b18cb49015917a26d3
Reviewed-on: https://gerrit.libreoffice.org/27345
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/configure.ac b/configure.ac
index d93de79..cd7c9c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3822,18 +3822,6 @@ if test "$COM_IS_CLANG" = TRUE; then
 fi
 AC_SUBST(COM_IS_CLANG)
 
-if test "$CCACHE" != "" -a "$COM_IS_CLANG" = TRUE; then
-if test -z "$CCACHE_CPP2"; then
-if test "$enable_ccache" = "" ; then
-AC_MSG_WARN([Using ccache with Clang without CCACHE_CPP2 set 
causes spurious warnings/errors.])
-add_warning "Using ccache with Clang without CCACHE_CPP2 set 
causes spurious warnings/errors. Disabling it."
-CCACHE=
-else
-AC_MSG_ERROR([Using --enable-ccache with Clang without CCACHE_CPP2 
set causes spurious warnings/errors.])
-fi
-fi
-fi
-
 #
 # prefix C with ccache if needed
 #
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 8c32795..4d0378b 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -46,6 +46,7 @@ endef
 define gb_CObject__command_pattern
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
+   $(gb_COMPILER_SETUP) \
$(if $(5),$(gb_COMPILER_PLUGINS_SETUP)) \
$(if $(filter %.c %.m,$(3)), $(gb_CC), $(gb_CXX)) \
$(DEFS) \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 8f26cbf..10f9a47 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -218,11 +218,13 @@ ifneq ($(UPDATE_FILES),)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang 
--scope=$(UPDATE_FILES)
 endif
 endif
-# extra EF variable to make the command line shorter (just like is done with 
$(SRCDIR) etc.)
-gb_COMPILER_PLUGINS_SETUP := EF=$(SRCDIR)/include/sal/log-areas.dox && 
ICECC_EXTRAFILES=$$EF CCACHE_EXTRAFILES=$$EF CCACHE_CPP2=1
+# set CCACHE_CPP2=1 to prevent clang generating spurious warnings
+gb_COMPILER_SETUP := CCACHE_CPP2=1
+gb_COMPILER_PLUGINS_SETUP := 
ICECC_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox 
CCACHE_EXTRAFILES=$(SRCDIR)/include/sal/log-areas.dox
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS := \
 -Xclang -plugin-arg-loplugin -Xclang --warnings-as-errors
 else
+gb_COMPILER_SETUP :=
 gb_COMPILER_PLUGINS :=
 gb_COMPILER_PLUGINS_SETUP :=
 gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS :=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2016-01-18 Thread Peter Foley 
 configure.ac   |   13 ++---
 solenv/gbuild/platform/com_GCC_defs.mk |1 +
 solenv/gbuild/platform/unxgcc.mk   |4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 0533b155354f086aa8dc1de06c7db92d3f3be4f5
Author: Peter Foley 
Date:   Fri Jan 15 11:34:20 2016 -0500

Wrappers for LTO

When building with GCC, the gcc-ar, gcc-ranlib, and gcc-nm wrappers
must be used for the linker to properly resolve symbols from static
libraries containing LTO objects.
Likewise, clang requires the llvm-ar, llvm-ranlib, and llvm-nm
wrappers.

Change-Id: I539017b6da7732f998a49820dc01d0e6b302952a
Reviewed-on: https://gerrit.libreoffice.org/21502
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 39f61c1..3750beb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5163,10 +5163,17 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
 # /path/to/compiler/foo-gcc" you need to set the AR etc env vars
 # explicitly. Or put /path/to/compiler in PATH yourself.
 
-AC_CHECK_TOOL(AR,ar)
-AC_CHECK_TOOL(NM,nm)
+# Use wrappers for LTO
+if test "$ENABLE_LTO" == "TRUE" -a "$COM_IS_CLANG" != "TRUE"; then
+AC_CHECK_TOOL(AR,gcc-ar)
+AC_CHECK_TOOL(NM,gcc-nm)
+AC_CHECK_TOOL(RANLIB,gcc-ranlib)
+else
+AC_CHECK_TOOL(AR,ar)
+AC_CHECK_TOOL(NM,nm)
+AC_CHECK_TOOL(RANLIB,ranlib)
+fi
 AC_CHECK_TOOL(OBJDUMP,objdump)
-AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(READELF,readelf)
 AC_CHECK_TOOL(STRIP,strip)
 if test "$_os" = "WINNT"; then
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 3f79605..877f502 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -130,6 +130,7 @@ gb_CFLAGS_COMMON += -std=gnu89
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto
+gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
 else
 gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2
 endif
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 6cd206c..7e43ce3 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -145,7 +145,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) 
$(ILIBTARGET)))
$(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\
$(READELF) -d $(1) | grep SONAME > 
$(WORKDIR)/LinkTarget/$(2).exports.tmp; \
-   $(NM) --dynamic --extern-only --defined-only --format=posix 
$(1) \
+   $(NM) $(gb_LTOPLUGINFLAGS) --dynamic --extern-only 
--defined-only --format=posix $(1) \
| cut -d' ' -f1-2 \
>> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
$(call 
gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,
 \
@@ -155,7 +155,7 @@ endef
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
-   $(gb_AR) -rsu $(1) \
+   $(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
$(if $(LD_PLUGIN),--plugin $(LD_PLUGIN)) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2015-01-09 Thread Michael Stahl 
 configure.ac   |4 
 solenv/gbuild/gbuild.mk|3 ++-
 solenv/gbuild/platform/com_MSC_defs.mk |5 -
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 5d061167ee9b88628a1936041ee90c62e4dc1e18
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 9 14:59:27 2015 +0100

gbuild: try to fix windows non-debug builds

The ENABLE_CRASHREP is no longer AC_SUBSTed by configure, so it is
always non-empty in config_host.mk, resulting in -Zi without -FS,
which breaks MSVC 2013 builds.

Leave a placeholder in configure for the new crash reporter vaporware,
and force the CFLAGS to be the same as in the --eanble-symbols case.

(regression from 8ab4d2f29fdd2c058db23f6ee7b2200655d4c6f6)

Change-Id: I476fb2e4f50de5304632628b25e3997ea6c31c27

diff --git a/configure.ac b/configure.ac
index cb12418..3234a2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4527,6 +4527,10 @@ dnl Check for syslog header
 dnl ===
 AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
 
+# placeholder for future crash reporter feature
+ENABLE_CRASHDUMP=
+AC_SUBST(ENABLE_CRASHDUMP)
+
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===
 AC_MSG_CHECKING([whether to turn warnings to errors])
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 3d1f0f1..48439f3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -133,10 +133,11 @@ ifeq ($(HARDLINKDELIVER),TRUE)
 gb_Deliver_HARDLINK := $(true)
 endif
 
+# note: ENABLE_CRASHDUMP turns on gb_SYMBOL
 ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
 gb_SYMBOL := $(false)
 else
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)$(ENABLE_CRASHDUMP)),)
 gb_SYMBOL := $(true)
 endif
 endif
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 43c9198..c5804a8 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -265,11 +265,6 @@ gb_DEBUG_CFLAGS+=-FS
 endif
 
 # this does not use CFLAGS so it is not overridable
-ifneq ($(ENABLE_CRASHDUMP),)
-gb_CFLAGS+=-Zi
-gb_CXXFLAGS+=-Zi
-endif
-
 ifeq ($(gb_SYMBOL),$(true))
 gb_CFLAGS+=$(gb_DEBUG_CFLAGS)
 gb_CXXFLAGS+=$(gb_DEBUG_CFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2014-12-10 Thread Christian Lohmaier 
 configure.ac   |6 +-
 solenv/gbuild/platform/com_MSC_defs.mk |2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 5225cd46919a028add3772564fd0d63e99078820
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed Dec 10 15:21:30 2014 +0100

define _USING_V110_SDK71_ when building with VS2013 against 7.1A SDK

and drop old VS2012 part from configure.ac

Change-Id: If0bedff0972a40f92aaf86140a0405d2af1dbc8d

diff --git a/configure.ac b/configure.ac
index 0fcfbc1..4db47f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3522,13 +3522,9 @@ if test $_os = WINNT; then
 # are always better, we list them in reverse chronological order.
 
 case $vcnum in
-110)
-COMEX=14
-WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.0 7.1A
-;;
 120)
 COMEX=15
-WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.1A 8.1 8.0
+WINDOWS_SDK_ACCEPTABLE_VERSIONS=8.1A 8.1 8.0 7.1A
 ;;
 esac
 
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2c6dc19..7590a7b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -47,7 +47,7 @@ gb_COMPILERDEFS := \
-D_MT \
-D_DLL \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-   $(if $(findstring 
110_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
+   $(if $(findstring 
120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
 
 ifeq ($(CPUNAME),INTEL)
 gb_COMPILERDEFS += \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild

2014-09-24 Thread Peter Foley 
 configure.ac  |2 +-
 solenv/gbuild/gbuild.help.txt |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff6a6940aafa2164c5f53b1d4c09dfe995b562b8
Author: Peter Foley pefol...@pefoley.com
Date:   Tue Sep 23 21:43:52 2014 -0400

fix a typo in gbuild help and improve a autoconf error message

Change-Id: Iaee342ae6d612e35d1d2dfa91edbc952d4f73b4e
Reviewed-on: https://gerrit.libreoffice.org/11616
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com

diff --git a/configure.ac b/configure.ac
index a896810..ee434df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9680,7 +9680,7 @@ dnl Checking for patch
 dnl ***
 AC_PATH_PROG(PATCH, patch)
 if test -z $PATCH; then
-AC_MSG_ERROR([\patch\ not found in \$PATH, install it])
+AC_MSG_ERROR([patch not found in \$PATH, install it])
 fi
 
 dnl On Solaris, FreeBSD or MacOS X, check if --with-gnu-patch was used
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 986c910..de69c33 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -123,6 +123,6 @@ INTERACTIVE VARIABLES:
gb_FULLDEPS Generate and use dependencies (on by default, handle 
with care).
gb_COLORUse ASCII color output.
gb_TITLES   Show progress in terminal title.
-   gb_Side Either host of build (default to host).
+   gb_Side Either host or build (default to host).
determine if config_host.mk or config_build.mk is used 
to
set the build environment.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac solenv/gbuild sw/source

2013-03-11 Thread Peter Foley 
 configure.ac|4 +---
 solenv/gbuild/TargetLocations.mk|8 
 solenv/gbuild/platform/com_GCC_class.mk |   14 +++---
 sw/source/ui/dbui/swdbtoolsclient.cxx   |2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit bda200348566da71ae7ec346108bc6a00c22bf12
Author: Peter Foley pefol...@verizon.net
Date:   Sun Mar 10 17:50:29 2013 -0400

add pch support to gcc

Change-Id: I58c11477c1ce48185528db3a8013b5dccf3947c6
Reviewed-on: https://gerrit.libreoffice.org/2653
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/configure.ac b/configure.ac
index d43892c..61eb8ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4394,9 +4394,7 @@ if test -n $enable_pch  test $enable_pch != no; 
then
 if test $_os = WINNT -a $WITH_MINGW != yes; then
 ENABLE_PCH=TRUE
 AC_MSG_RESULT([yes])
-# GCC PCH support is reportedly a hack that's not very reliable,
-# so support only Clang.
-elif test $GCC = yes -a $COM_GCC_IS_CLANG = TRUE; then
+elif test $GCC = yes; then
 ENABLE_PCH=TRUE
 AC_MSG_RESULT([yes])
 else
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 6fa782b..68a3c67 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -157,8 +157,8 @@ gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
 gb_Module_get_slowcheck_target = $(WORKDIR)/Module/slowcheck/$(1)
 gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
 gb_Module_get_target = $(WORKDIR)/Module/$(1)
-gb_NoexPrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
-gb_NoexPrecompiledHeader_get_target = 
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_NoexPrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
+gb_NoexPrecompiledHeader_get_target = 
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
 gb_NoexPrecompiledHeader_get_timestamp = 
$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
 gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
@@ -167,8 +167,8 @@ gb_Package_get_preparation_target = 
$(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
 gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1)
 gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1)
-gb_PrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
-gb_PrecompiledHeader_get_target = 
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_PrecompiledHeader_get_dep_target = 
$(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
+gb_PrecompiledHeader_get_target = 
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
 gb_PrecompiledHeader_get_timestamp = 
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
 gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
 gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index b51a723..b177dae 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -182,12 +182,16 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 
-ifeq ($(COM_GCC_IS_CLANG),TRUE)
 # PrecompiledHeader class
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_PrecompiledHeader_get_enableflags = -include-pch $(call 
gb_PrecompiledHeader_get_target,$(1))
+else
+gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call 
gb_PrecompiledHeader_get_target,$(1 \
+  -I $(dir $(call 
gb_PrecompiledHeader_get_target,$(1)))
+endif
 
-# Clang does not need any extra .o file for PCH
+# Clang and gcc do not need any extra .o file for PCH
 gb_PrecompiledHeader_get_objectfile =
 
 define gb_PrecompiledHeader__command
@@ -209,7 +213,12 @@ endef
 
 # NoexPrecompiledHeader class
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
 gb_NoexPrecompiledHeader_get_enableflags = -include-pch $(call 
gb_NoexPrecompiledHeader_get_target,$(1))
+else
+gb_NoexPrecompiledHeader_get_enableflags = -include $(notdir $(subst 
.gch,,$(call gb_NoexPrecompiledHeader_get_target,$(1 \
+  -I $(dir $(call 
gb_NoexPrecompiledHeader_get_target,$(1)))
+endif
 
 gb_NoexPrecompiledHeader_get_objectfile =
 
@@ -229,7 +238,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(call gb_cxx_dep_copy,$(call