This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit c98f7d5f46e8acf0e44b4efc19ee1fd9beb59aed Author: Don Lewis <[email protected]> AuthorDate: Sun Jun 1 17:44:27 2025 -0700 Re-order include path. Re-order the compiler include path in nmake modules so that external directories are last to avoid inadvertently picking up system headers instead of internal headers. (cherry picked from commit c66d490685e775f7a68f702961f35994061924c7) (cherry picked from commit 2782f488357c15cffcd95020057104ed37a60e17) --- main/connectivity/source/drivers/evoab2/makefile.mk | 2 +- main/forms/source/xforms/submission/makefile.mk | 3 ++- main/forms/source/xforms/xpathlib/makefile.mk | 3 ++- main/pyuno/source/loader/makefile.mk | 2 +- main/pyuno/source/module/makefile.mk | 2 +- main/shell/source/backends/kde4be/makefile.mk | 2 +- main/shell/source/backends/kdebe/makefile.mk | 2 +- main/solenv/inc/target.mk | 4 ++-- main/xmlsecurity/source/xmlsec/makefile.mk | 3 ++- main/xmlsecurity/source/xmlsec/nss/makefile.mk | 3 ++- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/main/connectivity/source/drivers/evoab2/makefile.mk b/main/connectivity/source/drivers/evoab2/makefile.mk index 3083e4ec45..84a9682f1d 100644 --- a/main/connectivity/source/drivers/evoab2/makefile.mk +++ b/main/connectivity/source/drivers/evoab2/makefile.mk @@ -41,7 +41,7 @@ dummy: PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE : pkg_config.mk -CFLAGS+=$(GOBJECT_CFLAGS) +INCSYSTEM+=$(GOBJECT_CFLAGS) # --- Files ------------------------------------- diff --git a/main/forms/source/xforms/submission/makefile.mk b/main/forms/source/xforms/submission/makefile.mk index 520781388b..52a9896305 100644 --- a/main/forms/source/xforms/submission/makefile.mk +++ b/main/forms/source/xforms/submission/makefile.mk @@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE: $(PRJ)$/makefile.pmk .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +INCSYSTEM+=$(LIBXML_CFLAGS) +CFLAGS+=-DSYSTEM_LIBXML .ENDIF # --- Files -------------------------------------------------------- diff --git a/main/forms/source/xforms/xpathlib/makefile.mk b/main/forms/source/xforms/xpathlib/makefile.mk index 6f0cd9a386..6c0e942d36 100644 --- a/main/forms/source/xforms/xpathlib/makefile.mk +++ b/main/forms/source/xforms/xpathlib/makefile.mk @@ -36,7 +36,8 @@ ENABLE_EXCEPTIONS=TRUE INCPRE+=$(PRJ)$/source$/inc .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +INCSYSTEM+=$(LIBXML_CFLAGS) +CFLAGS+=-DSYSTEM_LIBXML .ENDIF # --- Files -------------------------------------------------------- diff --git a/main/pyuno/source/loader/makefile.mk b/main/pyuno/source/loader/makefile.mk index f54597044b..1e9ac58443 100644 --- a/main/pyuno/source/loader/makefile.mk +++ b/main/pyuno/source/loader/makefile.mk @@ -41,7 +41,7 @@ DIRECT = $(LINKFLAGSDEFS) .IF "$(SYSTEM_PYTHON)" == "YES" PYTHONLIB=$(PYTHON_LIBS) -CFLAGS+=$(PYTHON_CFLAGS) +INCSYSTEM+=$(PYTHON_CFLAGS) .IF "$(EXTRA_CFLAGS)"!="" PYTHONLIB+=-framework Python .ENDIF # "$(EXTRA_CFLAGS)"!="" diff --git a/main/pyuno/source/module/makefile.mk b/main/pyuno/source/module/makefile.mk index 1b2355ed5c..504a024025 100644 --- a/main/pyuno/source/module/makefile.mk +++ b/main/pyuno/source/module/makefile.mk @@ -60,7 +60,7 @@ DLLPOST=.pyd .IF "$(SYSTEM_PYTHON)" == "YES" PYTHONLIB=$(PYTHON_LIBS) -CFLAGS+=$(PYTHON_CFLAGS) +INCSYSTEM+=$(PYTHON_CFLAGS) .ELSE # "$(SYSTEM_PYTHON)" == "YES" .INCLUDE : pyversion.mk CFLAGS+=-I$(SOLARINCDIR)$/python diff --git a/main/shell/source/backends/kde4be/makefile.mk b/main/shell/source/backends/kde4be/makefile.mk index 1ca2927be0..b3aa10b681 100644 --- a/main/shell/source/backends/kde4be/makefile.mk +++ b/main/shell/source/backends/kde4be/makefile.mk @@ -45,7 +45,7 @@ DLLPRE = .IF "$(ENABLE_KDE4)" == "TRUE" -CFLAGS+=$(KDE4_CFLAGS) +INCSYSTEM+=$(KDE4_CFLAGS) # --- Files --- diff --git a/main/shell/source/backends/kdebe/makefile.mk b/main/shell/source/backends/kdebe/makefile.mk index ad0fce0aac..46412d3d57 100644 --- a/main/shell/source/backends/kdebe/makefile.mk +++ b/main/shell/source/backends/kdebe/makefile.mk @@ -45,7 +45,7 @@ DLLPRE = .IF "$(ENABLE_KDE)" == "TRUE" -CFLAGS+=$(KDE_CFLAGS) +INCSYSTEM+=$(KDE_CFLAGS) # --- Files --- diff --git a/main/solenv/inc/target.mk b/main/solenv/inc/target.mk index 0641096682..b13bfb25b9 100644 --- a/main/solenv/inc/target.mk +++ b/main/solenv/inc/target.mk @@ -57,9 +57,9 @@ SOLARINC+=$(JDKINCS) INCLUDE:= .EXPORT : INCLUDE .IF "$(PRJINC)"!="" -INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) $(INCLOCPRJ:^"-I":s/-I-I/-I/) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM) .ELSE # "$(PRJINC)"!="" -INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) +INCLUDE!:=-I. $(INCPRE:^"-I":s/-I-I/-I/) -I$(INCLOCAL) -I$(INCPCH) -I$(INC) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(null,$(UNOINCLUDES) $(NULL) -I$(UNOINCLUDES)) -I$(INCEXT) -I$(PRJ)/res -I$(INCPOST) $(INCSYSTEM) .ENDIF # "$(PRJINC)"!="" INCLUDE_C=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) .EXPORT : LIB diff --git a/main/xmlsecurity/source/xmlsec/makefile.mk b/main/xmlsecurity/source/xmlsec/makefile.mk index 034c07297d..8b2b90e0eb 100644 --- a/main/xmlsecurity/source/xmlsec/makefile.mk +++ b/main/xmlsecurity/source/xmlsec/makefile.mk @@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE : $(PRJ)$/util$/target.pmk .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +INCSYSTEM+=$(LIBXML_CFLAGS) +CFLAGS+=-DSYSTEM_LIBXML .ENDIF .IF "$(ENABLE_NSS_MODULE)"!="YES" diff --git a/main/xmlsecurity/source/xmlsec/nss/makefile.mk b/main/xmlsecurity/source/xmlsec/nss/makefile.mk index 843887d696..352034945c 100644 --- a/main/xmlsecurity/source/xmlsec/nss/makefile.mk +++ b/main/xmlsecurity/source/xmlsec/nss/makefile.mk @@ -34,7 +34,8 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE : $(PRJ)$/util$/target.pmk .IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) +INCSYSTEM+=$(LIBXML_CFLAGS) +CFLAGS+=-DSYSTEM_LIBXML .ENDIF .IF "$(ENABLE_NSS_MODULE)"!="YES"
