diff options
author | Chris Johns <chrisj@rtems.org> | 2022-05-05 12:32:16 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2022-05-05 12:32:16 +1000 |
commit | 7d80719f7472debdf7d54a61f9ffc7fc31d57d13 (patch) | |
tree | 9b2f5518ac45ce014c60c425eb34da8f57324a88 /rtems | |
parent | 7: Back port gcov-tool merge-stream to GCC 12 (diff) | |
download | rtems-source-builder-7d80719f7472debdf7d54a61f9ffc7fc31d57d13.tar.bz2 |
sb/setbuilder: Control buildsets using the --with-* command line option
- Expand macros in buildset file names
- Add support to buildsets for `%defineifnot`
- Update 6 and 7 to support command line build overrides
Closes #4646
Diffstat (limited to 'rtems')
-rw-r--r-- | rtems/config/6/rtems-default.bset | 23 | ||||
-rw-r--r-- | rtems/config/7/rtems-default.bset | 26 | ||||
-rw-r--r-- | rtems/config/tools/rtems-default-tools.bset | 15 |
3 files changed, 42 insertions, 22 deletions
diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset index 731c9d8..cee9091 100644 --- a/rtems/config/6/rtems-default.bset +++ b/rtems/config/6/rtems-default.bset @@ -4,16 +4,17 @@ %include 6/rtems-base.bset # -# Build gdb first to raise the Python install error as early as possible. -# GDB needs expat so it needs to be built before. +# Default RTEMS build. Override on the command line to the +# the RSB. For example to test the latest version of gcc use: # +# --with-rtems-gcc=tools/rtems-gcc-head-newlib-head +# +%defineifnot with_rtems_dtc devel/dtc-1.6.1-1 +%defineifnot with_rtems_expat devel/expat-2.4.8-1 +%defineifnot with_rtems_gmp devel/gmp-6.2.1 +%defineifnot with_rtems_gdb tools/rtems-gdb-11.2 +%defineifnot with_rtems_binutils tools/rtems-binutils-2.38 +%defineifnot with_rtems_gcc tools/rtems-gcc-10-newlib-head +%defineifnot with_rtems_tools tools/rtems-tools-6 -devel/dtc-1.6.1-1 - -devel/expat-2.4.8-1 -devel/gmp-6.2.1 -tools/rtems-gdb-11.2 - -tools/rtems-binutils-2.38 -tools/rtems-gcc-10-newlib-head -tools/rtems-tools-6 +tools/rtems-default-tools.bset diff --git a/rtems/config/7/rtems-default.bset b/rtems/config/7/rtems-default.bset index e94cf21..0a8fcac 100644 --- a/rtems/config/7/rtems-default.bset +++ b/rtems/config/7/rtems-default.bset @@ -1,16 +1,20 @@ +# +# Default tools configuration. +# %include 7/rtems-base.bset # -# Build gdb first to raise the Python install error as early as possible. -# GDB needs expat so it needs to be built before. +# Default RTEMS build. Override on the command line to the +# the RSB. For example to test the latest version of gcc use: # +# --with-rtems-gcc=tools/rtems-gcc-head-newlib-head +# +%defineifnot with_rtems_dtc devel/dtc-1.6.1-1 +%defineifnot with_rtems_expat devel/expat-2.4.8-1 +%defineifnot with_rtems_gmp devel/gmp-6.2.1 +%defineifnot with_rtems_gdb tools/rtems-gdb-head +%defineifnot with_rtems_binutils tools/rtems-binutils-head +%defineifnot with_rtems_gcc tools/rtems-gcc-head-newlib-head +%defineifnot with_rtems_tools tools/rtems-tools-6 -devel/dtc-1.6.1-1 - -devel/expat-2.4.8-1 -devel/gmp-6.2.1 -tools/rtems-gdb-head - -tools/rtems-binutils-head -tools/rtems-gcc-head-newlib-head -tools/rtems-tools-6 +tools/rtems-default-tools.bset diff --git a/rtems/config/tools/rtems-default-tools.bset b/rtems/config/tools/rtems-default-tools.bset new file mode 100644 index 0000000..7d273cf --- /dev/null +++ b/rtems/config/tools/rtems-default-tools.bset @@ -0,0 +1,15 @@ +# +# Default tools build +# + +# +# Build gdb first to raise the Python install error as early as +# possible. GDB needs expat so it needs to be built before gdb. +# +%{with_rtems_dtc} +%{with_rtems_expat} +%{with_rtems_gmp} +%{with_rtems_gdb} +%{with_rtems_binutils} +%{with_rtems_gcc} +%{with_rtems_tools} |