external/harfbuzz/ExternalProject_harfbuzz.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 93aa7e615bbc1524c86075b25963d339ec87f464
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Apr 29 12:10:44 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Apr 30 11:26:34 2025 +0200
harfbuzz: create symbols with --enable-symbols
--enable-symbols can be used independently (and selectively) from
--enable-debug or --enable-dbgutil, so if neither of those are
specified, check whether symbols should be created and pass the flags to
c_args / cpp_args
Change-Id: I6d5bc9b7857a2538b71efb820534c2a18d1dfd3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184753
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index bb4611776cab..aae898a82fe8 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -51,7 +51,8 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
| $(call gb_Externa
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}$(LIBO_PATH_SEPARATOR)$(gb_UnpackedTarball_workdir)/graphite$(if
$(SYSTEM_ICU),,$(LIBO_PATH_SEPARATOR)$(gb_UnpackedTarball_workdir)/icu)" \
PYTHONWARNINGS= \
$(if $(MESON_NO_PYTHON),,$(call
gb_ExternalExecutable_get_command,python)) $(MESON) setup builddir \
- -Ddefault_library=static -Dbuildtype=$(if
$(ENABLE_DBGUTIL),debug,$(if $(ENABLE_DEBUG),debugoptimized,release)) \
+ -Ddefault_library=static -Dbuildtype=$(if
$(ENABLE_DBGUTIL),debug,$(if $(ENABLE_DEBUG),debugoptimized,release \
+ $(if $(call
gb_Module__symbols_enabled,harfbuzz),$(addsuffix "$(strip
$(gb_DEBUGINFO_FLAGS))",-Dc_args= -Dcpp_args=)))) \
-Dauto_features=disabled \
-Dcpp_std=$(subst -std:,,$(subst -std=,,$(filter
-std%,$(CXXFLAGS_CXX11)))) \
-Dtests=disabled \
commit 0fccc92e326ef663d0e615df50831d32b446233c
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Apr 29 11:19:49 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Apr 30 11:26:27 2025 +0200
fix harfbuzz with --enable-debug on win (msvc debug runtime mismatch)
debug type in meson uses flags to use debug versions of the vscrt, this
causes issues when using --enable-debug since the rest of the build only
uses the debug runtime if the --enable-dbgutil switch is used. These two
being misaligned then causes linker failures, harfbuzz using the debug
runtime and rest of LO using the release version is not compatible:
libharfbuzz.a(hb-blob.cc.obj) : error LNK2038: mismatch detected for
'RuntimeLibrary': value 'MDd_DynamicDebug' doesn't match value
'MD_DynamicRelease' in drawmode.o
the debugoptimized build-type doesn't use the debug runtime and also
uses optimization flags that don't interfere with debugging. The runtime
could also be forced independently using -Db_vscrt=<mdd,md,mtd,mt>, but
the automatic selection from the buildtype/the additional optimization
in the --enable-debug case should be fine.
Change-Id: I9263fa7b6fdb71ab9efb00ae634ddf16453e50cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184751
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index ee43a541aecc..bb4611776cab 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
| $(call gb_Externa
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}$(LIBO_PATH_SEPARATOR)$(gb_UnpackedTarball_workdir)/graphite$(if
$(SYSTEM_ICU),,$(LIBO_PATH_SEPARATOR)$(gb_UnpackedTarball_workdir)/icu)" \
PYTHONWARNINGS= \
$(if $(MESON_NO_PYTHON),,$(call
gb_ExternalExecutable_get_command,python)) $(MESON) setup builddir \
- -Ddefault_library=static -Dbuildtype=$(if
$(ENABLE_DEBUG),debug,release) \
+ -Ddefault_library=static -Dbuildtype=$(if
$(ENABLE_DBGUTIL),debug,$(if $(ENABLE_DEBUG),debugoptimized,release)) \
-Dauto_features=disabled \
-Dcpp_std=$(subst -std:,,$(subst -std=,,$(filter
-std%,$(CXXFLAGS_CXX11)))) \
-Dtests=disabled \
