[PATCH 2/2] testproc/gsed: Do not use %include with internal builds
chrisj at rtems.org
chrisj at rtems.org
Fri Sep 16 06:59:29 UTC 2022
From: Chris Johns <chrisj at rtems.org>
---
bare/config/devel/gnu-default-tools.bset | 1 +
bare/config/textproc/gsed-internal.bset | 5 ++++-
rtems/config/tools/rtems-default-tools.bset | 3 ++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/bare/config/devel/gnu-default-tools.bset b/bare/config/devel/gnu-default-tools.bset
index f038352..cb253f4 100644
--- a/bare/config/devel/gnu-default-tools.bset
+++ b/bare/config/devel/gnu-default-tools.bset
@@ -10,6 +10,7 @@
# GCC requires a GNU sed so build an internal version if one is not
# available
#
+%define _internal_gsed_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
%include textproc/gsed-internal
#
diff --git a/bare/config/textproc/gsed-internal.bset b/bare/config/textproc/gsed-internal.bset
index e93e1a5..c45e498 100644
--- a/bare/config/textproc/gsed-internal.bset
+++ b/bare/config/textproc/gsed-internal.bset
@@ -2,8 +2,11 @@
# Internal GNU sed
#
+%if !{defined _internal_gsed_path}
+ %error no gsed internal install path defined
+%endif
+
%define _internal_gsed yes
-%define _internal_gsed_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
%define _disable_collecting yes
%define _disable_packaging yes
%define _disable_reporting yes
diff --git a/rtems/config/tools/rtems-default-tools.bset b/rtems/config/tools/rtems-default-tools.bset
index 8ec6721..b81f1e8 100644
--- a/rtems/config/tools/rtems-default-tools.bset
+++ b/rtems/config/tools/rtems-default-tools.bset
@@ -5,7 +5,8 @@
# GCC requires a GNU sed so build an internal version if one is not
# available
#
-%include textproc/gsed-internal.bset
+%define _internal_gsed_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
+textproc/gsed-internal
#
# Build gdb first to raise the Python install error as early as
--
2.37.1
More information about the devel
mailing list