From b40fba268658e2ebe5581831940f48269949b4ba Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Fri, 1 Aug 2025 15:06:18 -0500
Subject: [PATCH] spec/build/*.yml: Add contrib/.../uuid and
 contrib/.../utf8proc

This addition is needed to account for utf8proc and uuid moving
from cpukit/include to contrib. Both include directories need
to stay globally available.
---
 spec/build/cpukit/librtemscpu.yml             | 4 +---
 spec/build/cpukit/objshell.yml                | 3 +--
 spec/build/cpukit/objutf8.yml                 | 3 +--
 spec/build/cpukit/optincludes.yml             | 2 +-
 spec/build/testsuites/fstests/fsbdpart01.yml  | 3 +--
 spec/build/testsuites/libtests/utf8proc01.yml | 3 +--
 spec/build/testsuites/samples/fileio.yml      | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index 9368caf2a6..0b60e70cd4 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -8,9 +8,7 @@ cppflags: []
 cxxflags:
 - ${COVERAGE_COMPILER_FLAGS}
 enabled-by: true
-includes:
-- contrib/cpukit/uuid/
-- contrib/cpukit/utf8proc/
+includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}
   source:
diff --git a/spec/build/cpukit/objshell.yml b/spec/build/cpukit/objshell.yml
index 9ad67b6ac3..2eaf4e17cf 100644
--- a/spec/build/cpukit/objshell.yml
+++ b/spec/build/cpukit/objshell.yml
@@ -6,8 +6,7 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by: true
-includes:
-- contrib/cpukit/uuid/
+includes: []
 install: []
 links: []
 source:
diff --git a/spec/build/cpukit/objutf8.yml b/spec/build/cpukit/objutf8.yml
index fcebbdc129..44f8571302 100644
--- a/spec/build/cpukit/objutf8.yml
+++ b/spec/build/cpukit/objutf8.yml
@@ -6,8 +6,7 @@ copyrights:
 cppflags: []
 cxxflags: []
 enabled-by: true
-includes:
-- contrib/cpukit/utf8proc/
+includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}/
   source:
diff --git a/spec/build/cpukit/optincludes.yml b/spec/build/cpukit/optincludes.yml
index e5807cf74b..e5e9402113 100644
--- a/spec/build/cpukit/optincludes.yml
+++ b/spec/build/cpukit/optincludes.yml
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 actions:
-- set-value: cpukit/include cpukit/score/cpu/${ARCH}/include contrib/cpukit/fastlz/ contrib/cpukit/zlib/ contrib/cpukit/xz-embedded/userspace/
+- set-value: cpukit/include cpukit/score/cpu/${ARCH}/include contrib/cpukit/fastlz/ contrib/cpukit/utf8proc/ contrib/cpukit/uuid/ contrib/cpukit/zlib/ contrib/cpukit/xz-embedded/userspace/
 - substitute: null
 - env-assign: null
 build-type: option
diff --git a/spec/build/testsuites/fstests/fsbdpart01.yml b/spec/build/testsuites/fstests/fsbdpart01.yml
index 733c5d0755..9644583b89 100644
--- a/spec/build/testsuites/fstests/fsbdpart01.yml
+++ b/spec/build/testsuites/fstests/fsbdpart01.yml
@@ -7,8 +7,7 @@ cppflags: []
 cxxflags: []
 enabled-by: true
 features: c cprogram
-includes:
-- contrib/cpukit/uuid/
+includes: []
 ldflags: []
 links: []
 source:
diff --git a/spec/build/testsuites/libtests/utf8proc01.yml b/spec/build/testsuites/libtests/utf8proc01.yml
index e5fb1831e5..ce63477267 100644
--- a/spec/build/testsuites/libtests/utf8proc01.yml
+++ b/spec/build/testsuites/libtests/utf8proc01.yml
@@ -7,8 +7,7 @@ cppflags: []
 cxxflags: []
 enabled-by: true
 features: c cprogram
-includes:
-- contrib/cpukit/utf8proc/
+includes: []
 ldflags: []
 links: []
 source:
diff --git a/spec/build/testsuites/samples/fileio.yml b/spec/build/testsuites/samples/fileio.yml
index 6ccd992bab..4db7a81d88 100644
--- a/spec/build/testsuites/samples/fileio.yml
+++ b/spec/build/testsuites/samples/fileio.yml
@@ -7,8 +7,7 @@ cppflags: []
 cxxflags: []
 enabled-by: true
 features: c cprogram
-includes:
-- contrib/cpukit/uuid/
+includes: []
 ldflags: []
 links: []
 source: