From 996ebbcbe80508c94a54fb91bab2a6dcd3947ab4 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Thu, 29 Aug 2024 12:39:30 +0200 Subject: [PATCH] qt5: filter out base-$(KERNEL) include path Issue #5325 --- repos/libports/lib/import/import-qt5_cmake.mk | 2 +- repos/libports/lib/import/import-qt5_qmake.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/libports/lib/import/import-qt5_cmake.mk b/repos/libports/lib/import/import-qt5_cmake.mk index 18984a9e8a..66e279b01f 100644 --- a/repos/libports/lib/import/import-qt5_cmake.mk +++ b/repos/libports/lib/import/import-qt5_cmake.mk @@ -23,7 +23,7 @@ GENODE_CMAKE_CFLAGS += \ $(CC_OPT_NOSTDINC) \ $(CC_MARCH) \ $(CC_OPT_PIC) \ - $(filter-out -I.,$(INCLUDES)) \ + $(filter-out -I. $(foreach i,$(INCLUDES),$(if $(findstring /base-$(KERNEL)/include,$(i)),$(i))),$(INCLUDES)) \ -I$(CURDIR)/build_dependencies/include/QtCore/spec/$(QT_PLATFORM) GENODE_CMAKE_LFLAGS_APP += \ diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk index fb1d6c485a..49732bd3e5 100644 --- a/repos/libports/lib/import/import-qt5_qmake.mk +++ b/repos/libports/lib/import/import-qt5_qmake.mk @@ -25,7 +25,7 @@ GENODE_QMAKE_CFLAGS += \ $(CC_OPT_NOSTDINC) \ $(CC_MARCH) \ $(CC_OPT_PIC) \ - $(filter-out -I.,$(INCLUDES)) \ + $(filter-out -I. $(foreach i,$(INCLUDES),$(if $(findstring /base-$(KERNEL)/include,$(i)),$(i))),$(INCLUDES)) \ -I$(CURDIR)/build_dependencies/include/QtCore/spec/$(QT_PLATFORM) GENODE_QMAKE_LFLAGS_APP += \