[PATCH RSB v2] Remove automake/autoconf from rtems 6 tools
Gedare Bloom
gedare at rtems.org
Thu Sep 16 15:01:35 UTC 2021
On Thu, Sep 16, 2021 at 8:56 AM Joel Sherrill <joel at rtems.org> wrote:
>
> These are unneeded with the waf build system.
>
> Closes #4081.
> ---
> bare/config/devel/autotools-base.bset | 9 ---------
> bare/config/devel/autotools-internal.bset | 13 -------------
> bare/config/devel/autotools.bset | 14 --------------
Not these.
> rtems/config/6/rtems-autotools-base.bset | 9 ---------
> rtems/config/6/rtems-autotools-internal.bset | 11 -----------
> rtems/config/6/rtems-autotools.bset | 25 -------------------------
> rtems/config/6/rtems-default.bset | 2 --
> rtems/config/6/rtems-microblaze.bset | 2 --
Just these. The rtems-autotools* ones :)
> rtems/config/tools/rtems-autoconf-2.69-1.cfg | 23 -----------------------
> rtems/config/tools/rtems-automake-1.12.6-1.cfg | 23 -----------------------
I don't think these can be removed either, I think they're used for
the gcc-cross build.
> 10 files changed, 131 deletions(-)
> delete mode 100644 bare/config/devel/autotools-base.bset
> delete mode 100644 bare/config/devel/autotools-internal.bset
> delete mode 100644 bare/config/devel/autotools.bset
> delete mode 100644 rtems/config/6/rtems-autotools-base.bset
> delete mode 100644 rtems/config/6/rtems-autotools-internal.bset
> delete mode 100644 rtems/config/6/rtems-autotools.bset
> delete mode 100644 rtems/config/tools/rtems-autoconf-2.69-1.cfg
> delete mode 100644 rtems/config/tools/rtems-automake-1.12.6-1.cfg
>
> diff --git a/bare/config/devel/autotools-base.bset b/bare/config/devel/autotools-base.bset
> deleted file mode 100644
> index 22456ed..0000000
> --- a/bare/config/devel/autotools-base.bset
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -#
> -# Build set for autoconf, automake, and libtools.
> -#
> -
> -%define release 1
> -
> -devel/autoconf-2.69-1
> -devel/automake-1.12.6-1
> -devel/libtool-2.4.2-1
> diff --git a/bare/config/devel/autotools-internal.bset b/bare/config/devel/autotools-internal.bset
> deleted file mode 100644
> index bad3890..0000000
> --- a/bare/config/devel/autotools-internal.bset
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -#
> -# Tools Set for Internal Autotools Stable
> -#
> -# Do not use via the command line.
> -#
> -
> -%define _internal_autotools yes
> -%define _disable_collecting yes
> -%define _disable_packaging yes
> -%define _disable_reporting yes
> -%define _disable_installing yes
> -
> -%include devel/autotools-base.bset
> diff --git a/bare/config/devel/autotools.bset b/bare/config/devel/autotools.bset
> deleted file mode 100644
> index 5fcafa4..0000000
> --- a/bare/config/devel/autotools.bset
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -#
> -# Build set for autoconf, automake, and libtools.
> -#
> -
> -%define release 1
> -
> -#
> -# A magic internal path that would break if changes in the defaults.mc
> -# macro file are made.
> -#
> -%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
> -
> -devel/autotools-internal.bset
> -devel/autotools-base.bset
> diff --git a/rtems/config/6/rtems-autotools-base.bset b/rtems/config/6/rtems-autotools-base.bset
> deleted file mode 100644
> index c6819c1..0000000
> --- a/rtems/config/6/rtems-autotools-base.bset
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -%define release 1
> -%define rtems_arch none
> -
> -%include 6/rtems-base.bset
> -
> -package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
> -
> -tools/rtems-autoconf-2.69-1
> -tools/rtems-automake-1.12.6-1
> diff --git a/rtems/config/6/rtems-autotools-internal.bset b/rtems/config/6/rtems-autotools-internal.bset
> deleted file mode 100644
> index 19d2f19..0000000
> --- a/rtems/config/6/rtems-autotools-internal.bset
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#
> -# Do not use via the command line.
> -#
> -
> -%define _internal_autotools yes
> -%define _disable_collecting yes
> -%define _disable_packaging yes
> -%define _disable_reporting yes
> -%define _disable_installing yes
> -
> -%include 6/rtems-autotools-base.bset
> diff --git a/rtems/config/6/rtems-autotools.bset b/rtems/config/6/rtems-autotools.bset
> deleted file mode 100644
> index e57d25d..0000000
> --- a/rtems/config/6/rtems-autotools.bset
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -#
> -# Autoconf and automake are not relocatable and cannot be cross-compiled.
> -# RTEMS uses autoconf and automake and building RTEMS in the RSB requires
> -# bootstrapping and this requires a current autoconf and automake. The RSB
> -# provides to support by:
> -#
> -# 1. Building and installing autoconf and automake with a prefix to a
> -# temporary internal path.
> -# 2. Using the temporary internal build, build and install another copy
> -# using the final prefix location.
> -#
> -
> -#
> -# A magic internal path that would break if changes in the defaults.mc
> -# macro file are made.
> -#
> -%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
> -
> -#
> -# Disable emailing reports of this building for RTEMS.
> -#
> -%define mail_disable
> -
> -6/rtems-autotools-internal
> -6/rtems-autotools-base
> diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
> index 1b60066..0c07b08 100644
> --- a/rtems/config/6/rtems-default.bset
> +++ b/rtems/config/6/rtems-default.bset
> @@ -3,8 +3,6 @@
> #
> %include 6/rtems-base.bset
>
> -6/rtems-autotools
> -
> #
> # Build gdb first to raise the Python install error as early as possible.
> # GDB needs expat so it needs to be built before.
> diff --git a/rtems/config/6/rtems-microblaze.bset b/rtems/config/6/rtems-microblaze.bset
> index 4b12899..3eb7a89 100644
> --- a/rtems/config/6/rtems-microblaze.bset
> +++ b/rtems/config/6/rtems-microblaze.bset
> @@ -6,8 +6,6 @@
> #
> %include 6/rtems-base.bset
>
> -6/rtems-autotools
> -
> devel/dtc-1.6.0-1
>
> #
> diff --git a/rtems/config/tools/rtems-autoconf-2.69-1.cfg b/rtems/config/tools/rtems-autoconf-2.69-1.cfg
> deleted file mode 100644
> index 71ef4ed..0000000
> --- a/rtems/config/tools/rtems-autoconf-2.69-1.cfg
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -#
> -# Autoconf 2.69.
> -#
> -
> -%if %{rtems_arch} == none
> - %define _target %{_host}
> -%endif
> -
> -%include %{_configdir}/checks.cfg
> -%include %{_configdir}/base.cfg
> -%include %{_configdir}/versions.cfg
> -
> -%define rtems_autoconf_version 2.69
> -
> -#
> -# Check the version of autoconf in the path.
> -#
> -%if %{__autoconf_ver} < %{rtems_autoconf_version}
> - #
> - # Tools configuration.
> - #
> - %include %{_configdir}/devel/autoconf-2.69-1.cfg
> -%endif
> diff --git a/rtems/config/tools/rtems-automake-1.12.6-1.cfg b/rtems/config/tools/rtems-automake-1.12.6-1.cfg
> deleted file mode 100644
> index f844013..0000000
> --- a/rtems/config/tools/rtems-automake-1.12.6-1.cfg
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -#
> -# Automake 1.12.6
> -#
> -
> -%if %{rtems_arch} == none
> - %define _target %{_host}
> -%endif
> -
> -%include %{_configdir}/checks.cfg
> -%include %{_configdir}/base.cfg
> -%include %{_configdir}/versions.cfg
> -
> -%define rtems_automake_version 1.12.6
> -
> -#
> -# Check the version of automake in the path.
> -#
> -%if %{__automake_ver} < %{rtems_automake_version}
> - #
> - # Tools configuration.
> - #
> - %include %{_configdir}/devel/automake-1.12.6-1.cfg
> -%endif
> --
> 1.8.3.1
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
More information about the devel
mailing list