This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 308dff5230 When using SYSTEM_LIBXSLT, LIBXSLT_CFLAGS must be added
***after*** local include paths, because when LIBXSLT_CFLAGS contains
"-I/usr/local/include", system boost headers end up being found there before
our local boost headers. So add LIBXSLT_CFLAGS to CFLAGSAPPEND instead of
CFLAGS.
308dff5230 is described below
commit 308dff52307b9448e143746f298bb3c028fc037a
Author: Damjan Jovanovic <[email protected]>
AuthorDate: Wed Apr 30 05:13:26 2025 +0200
When using SYSTEM_LIBXSLT, LIBXSLT_CFLAGS must be added ***after***
local include paths, because when LIBXSLT_CFLAGS contains
"-I/usr/local/include", system boost headers end up being found
there before our local boost headers. So add LIBXSLT_CFLAGS to
CFLAGSAPPEND instead of CFLAGS.
Patch by: me
(cherry picked from commit aa1f4ecdf0af2b4b877bfaec913d4ef42e7dad01)
---
main/l10ntools/source/help/makefile.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/l10ntools/source/help/makefile.mk
b/main/l10ntools/source/help/makefile.mk
index b2f91857e4..b5aae9d399 100644
--- a/main/l10ntools/source/help/makefile.mk
+++ b/main/l10ntools/source/help/makefile.mk
@@ -34,7 +34,7 @@ TARGETTYPE=CUI
.INCLUDE : helplinker.pmk
.IF "$(SYSTEM_LIBXSLT)" == "YES"
-CFLAGS+= $(LIBXSLT_CFLAGS)
+CFLAGSAPPEND+= $(LIBXSLT_CFLAGS)
.ELSE
LIBXSLTINCDIR=external$/libxslt
CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
