config_host.mk.in | 1 + configure.ac | 6 +++++- odk/CustomTarget_doxygen.mk | 4 ++-- tools/Library_tl.mk | 2 +- vcl/Library_vcl.mk | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-)
New commits: commit a51bdb58fb84e2814cb7080aaf25b12f00ec5c42 Author: Thorsten Behrens <[email protected]> AuthorDate: Thu Oct 3 17:35:38 2024 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Oct 3 17:36:44 2024 +0200 Fixup run doxygen via wsl in wsl-as-helper case This fixes up the merge of: commit e648996cc9c007a2b374946cd4555c0430052a7c Author: Christian Lohmaier <[email protected]> Date: 2023-07-11 16:48:24 +0200 run doxygen via wsl in wsl-as-helper case Change-Id: I91ab65c16ebb895461f75d33c140e341c696dc6e diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index ded0f0748eb9..03b43c0c7180 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -27,7 +27,7 @@ odk_cygwin_path = $(if $(MSYSTEM),$(1),$(call gb_Helper_cyg_path,$(1))) odk_cpp_PREFIX := $(call odk_cygwin_path,$(INSTDIR)/$(SDKDIRNAME)/include/) odk_cpp_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/cpp/main.dox \ $(SRCDIR)/include/sal/log-areas.dox \ - $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST)) + $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST))) odk_cpp_DOXY_WORKDIR := $(call odk_cygwin_path,$(gb_CustomTarget_workdir)/odk/docs/cpp/ref) $(eval $(call gb_CustomTarget_register_targets,odk/docs,\ @@ -71,7 +71,7 @@ odk_idl_PREFIX := $(call odk_cygwin_path,$(SRCDIR)/udkapi/ $(SRCDIR)/offapi/) odk_idl_DOXY_INPUT := $(call odk_cygwin_path,$(SRCDIR)/odk/docs/idl/main.dox \ $(addsuffix com,$(odk_idl_PREFIX)) \ $(addsuffix org,$(odk_idl_PREFIX)) \ - $(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl + $(SRCDIR)/odk/docs/idl/generated_idl_chapter_refs.idl) odk_idl_DOXY_WORKDIR := $(call odk_cygwin_path,$(gb_CustomTarget_workdir)/odk/docs/idl/ref) # don't depend on the IDL files directly but instead on the udkapi/offapi commit a42206154e4672539a83de6ae2574b6145ba35fd Author: Thorsten Behrens <[email protected]> AuthorDate: Fri Jan 12 12:01:29 2024 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Oct 3 17:36:44 2024 +0200 Fix system-libfixmath Seems distros start to disagree on whether its liblibfixmath or just libfixmath. Change-Id: I54a42b2ba050980ae632ab3c82254131cad7787e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161969 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/config_host.mk.in b/config_host.mk.in index a8b458c6ee00..a2a7f7b21c41 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -443,6 +443,7 @@ export LIBXML_JAR=@LIBXML_JAR@ export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@ export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@ export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@ +export LIBFIXMATH_LIBS=$(gb_SPACE)@LIBFIXMATH_LIBS@ export LOCKFILE=@LOCKFILE@ export LO_CLANG_CC=@LO_CLANG_CC@ export LO_CLANG_CXX=@LO_CLANG_CXX@ diff --git a/configure.ac b/configure.ac index 5a4255e58578..8b3db0f48339 100644 --- a/configure.ac +++ b/configure.ac @@ -10769,13 +10769,17 @@ if test "$with_system_libfixmath" = "yes"; then AC_LANG_PUSH([C++]) AC_CHECK_HEADER([libfixmath/fix16.hpp], [], [AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])], []) - AC_CHECK_LIB([libfixmath], [fix16_mul], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) + AC_CHECK_LIB([libfixmath], [fix16_mul], [LIBFIXMATH_LIBS=-llibfixmath], + [AC_CHECK_LIB([fixmath], [fix16_mul], [LIBFIXMATH_LIBS=-lfixmath], + [AC_MSG_ERROR(libfixmath lib not found or functional)])]) AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) SYSTEM_LIBFIXMATH= + LIBFIXMATH_LIBS= fi AC_SUBST([SYSTEM_LIBFIXMATH]) +AC_SUBST([LIBFIXMATH_LIBS]) dnl =================================================================== dnl Check for system glm diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 8269e6ae98bf..7933e7735cd6 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -116,7 +116,7 @@ endif ifeq ($(SYSTEM_LIBFIXMATH),TRUE) $(eval $(call gb_Library_add_libs,tl,\ - -llibfixmath \ + $(LIBFIXMATH_LIBS) \ )) endif diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index fb9687dc47c0..d4c72bfe9c0d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -565,7 +565,7 @@ vcl_headless_freetype_code=\ ifeq ($(SYSTEM_LIBFIXMATH),TRUE) $(eval $(call gb_Library_add_libs,vcl,\ - -llibfixmath \ + $(LIBFIXMATH_LIBS) \ )) endif
