[rtems-source-builder commit] devel/gcc: Check and build GNU sed if not available on build host

Chris Johns chrisj at rtems.org
Wed Sep 14 20:52:54 UTC 2022


Module:    rtems-source-builder
Branch:    master
Commit:    468fc79e8c7c8076e8b65be82ba2009e41dd6c8e
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=468fc79e8c7c8076e8b65be82ba2009e41dd6c8e

Author:    Chris Johns <chrisj at rtems.org>
Date:      Wed Sep 14 16:38:37 2022 +1000

devel/gcc: Check and build GNU sed if not available on build host

Closes #2300

---

 bare/config/devel/gnu-default-tools.bset    | 6 ++++++
 rtems/config/tools/rtems-default-tools.bset | 5 +++++
 source-builder/config/gcc-common-1.cfg      | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/bare/config/devel/gnu-default-tools.bset b/bare/config/devel/gnu-default-tools.bset
index dab8c5e..f038352 100644
--- a/bare/config/devel/gnu-default-tools.bset
+++ b/bare/config/devel/gnu-default-tools.bset
@@ -6,6 +6,12 @@
 
 %define gcc_version_message RTEMS bare %{rtems_version}, RSB %{_sbgit_id}, Newlib %{newlib_version}
 
+#
+# GCC requires a GNU sed so build an internal version if one is not
+# available
+#
+%include textproc/gsed-internal
+
 #
 # Build gdb first to raise the Python install error as early as
 # possible. GDB needs expat so it needs to be built before gdb.
diff --git a/rtems/config/tools/rtems-default-tools.bset b/rtems/config/tools/rtems-default-tools.bset
index 7d273cf..8ec6721 100644
--- a/rtems/config/tools/rtems-default-tools.bset
+++ b/rtems/config/tools/rtems-default-tools.bset
@@ -2,6 +2,11 @@
 # Default tools build
 #
 
+# GCC requires a GNU sed so build an internal version if one is not
+# available
+#
+%include textproc/gsed-internal.bset
+
 #
 # Build gdb first to raise the Python install error as early as
 # possible. GDB needs expat so it needs to be built before gdb.
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index 87ccef1..933202a 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -165,6 +165,10 @@ URL: 	   http://gcc.gnu.org/
 %build
   build_top=$(pwd)
 
+  %if %{defined _internal_gsed_path}
+    export PATH=%{_internal_gsed_path}/bin:$PATH
+  %endif
+
   %{build_directory}
 
   mkdir -p ${build_dir}



More information about the vc mailing list