From eba77eebf148f91db6661ea26b1079ad18d0342c Mon Sep 17 00:00:00 2001 From: Andy Caldwell Date: Tue, 12 Apr 2022 20:18:23 +0100 Subject: [PATCH 1/2] Add sensible dependencies to gcc package --- SPECS/gcc/gcc.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SPECS/gcc/gcc.spec b/SPECS/gcc/gcc.spec index 1dc30f9b4e1..2647f41518e 100644 --- a/SPECS/gcc/gcc.spec +++ b/SPECS/gcc/gcc.spec @@ -3,20 +3,22 @@ Summary: Contains the GNU compiler collection Name: gcc Version: 11.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner Group: Development/Tools URL: https://gcc.gnu.org/ Source0: https://ftp.gnu.org/gnu/gcc/%{name}-%{version}/%{name}-%{version}.tar.xz +Requires: binutils Requires: gcc-c++ = %{version}-%{release} +Requires: glibc-devel Requires: gmp +Requires: kernel-headers Requires: libgcc-atomic = %{version}-%{release} Requires: libgcc-devel = %{version}-%{release} Requires: libgomp-devel = %{version}-%{release} Requires: libmpc -Requires: libstdc++-devel = %{version}-%{release} Provides: cpp = %{version}-%{release} Provides: gcc-plugin-devel = %{version}-%{release} Provides: libasan = %{version}-%{release} @@ -268,6 +270,9 @@ make %{?_smp_mflags} check-gcc %{_lib64dir}/libgomp.spec %changelog +* Tue Apr 12 2022 Andy Caldwell - 11.2.0-3 +- Add minimal sensible dependencies to allow `gcc` to work out the box (`binutils`, `glibc-devel` and `kernel-headers`) + * Tue Jan 25 2022 Thomas Crain - 11.2.0-2 - Add provides for libasan, liblsan, libtsan, and libubsan (and their static counterparts) to the main package - Remove CVE-2019-15847 nopatch file (not relevant to our version of GCC) From 6af12c89c3c79769f471279423a144745d0ec2c5 Mon Sep 17 00:00:00 2001 From: Andy Caldwell Date: Wed, 27 Apr 2022 21:01:41 +0100 Subject: [PATCH 2/2] Update toolchain manifests --- .../manifests/package/pkggen_core_aarch64.txt | 18 +++++++-------- .../manifests/package/pkggen_core_x86_64.txt | 18 +++++++-------- .../manifests/package/toolchain_aarch64.txt | 22 +++++++++---------- .../manifests/package/toolchain_x86_64.txt | 22 +++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0ab22740073..b4d95bcbd76 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -20,15 +20,15 @@ mpfr-4.1.0-1.cm2.aarch64.rpm mpfr-devel-4.1.0-1.cm2.aarch64.rpm libmetalink-0.1.3-1.cm2.aarch64.rpm libmpc-1.2.1-1.cm2.aarch64.rpm -libgcc-11.2.0-2.cm2.aarch64.rpm -libgcc-atomic-11.2.0-2.cm2.aarch64.rpm -libgcc-devel-11.2.0-2.cm2.aarch64.rpm -libstdc++-11.2.0-2.cm2.aarch64.rpm -libstdc++-devel-11.2.0-2.cm2.aarch64.rpm -libgomp-11.2.0-2.cm2.aarch64.rpm -libgomp-devel-11.2.0-2.cm2.aarch64.rpm -gcc-11.2.0-2.cm2.aarch64.rpm -gcc-c++-11.2.0-2.cm2.aarch64.rpm +libgcc-11.2.0-3.cm2.aarch64.rpm +libgcc-atomic-11.2.0-3.cm2.aarch64.rpm +libgcc-devel-11.2.0-3.cm2.aarch64.rpm +libstdc++-11.2.0-3.cm2.aarch64.rpm +libstdc++-devel-11.2.0-3.cm2.aarch64.rpm +libgomp-11.2.0-3.cm2.aarch64.rpm +libgomp-devel-11.2.0-3.cm2.aarch64.rpm +gcc-11.2.0-3.cm2.aarch64.rpm +gcc-c++-11.2.0-3.cm2.aarch64.rpm libpkgconf-1.8.0-2.cm2.aarch64.rpm pkgconf-1.8.0-2.cm2.aarch64.rpm pkgconf-m4-1.8.0-2.cm2.noarch.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 183901f24bc..982ee3a086e 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -20,15 +20,15 @@ mpfr-4.1.0-1.cm2.x86_64.rpm mpfr-devel-4.1.0-1.cm2.x86_64.rpm libmetalink-0.1.3-1.cm2.x86_64.rpm libmpc-1.2.1-1.cm2.x86_64.rpm -libgcc-11.2.0-2.cm2.x86_64.rpm -libgcc-atomic-11.2.0-2.cm2.x86_64.rpm -libgcc-devel-11.2.0-2.cm2.x86_64.rpm -libstdc++-11.2.0-2.cm2.x86_64.rpm -libstdc++-devel-11.2.0-2.cm2.x86_64.rpm -libgomp-11.2.0-2.cm2.x86_64.rpm -libgomp-devel-11.2.0-2.cm2.x86_64.rpm -gcc-11.2.0-2.cm2.x86_64.rpm -gcc-c++-11.2.0-2.cm2.x86_64.rpm +libgcc-11.2.0-3.cm2.x86_64.rpm +libgcc-atomic-11.2.0-3.cm2.x86_64.rpm +libgcc-devel-11.2.0-3.cm2.x86_64.rpm +libstdc++-11.2.0-3.cm2.x86_64.rpm +libstdc++-devel-11.2.0-3.cm2.x86_64.rpm +libgomp-11.2.0-3.cm2.x86_64.rpm +libgomp-devel-11.2.0-3.cm2.x86_64.rpm +gcc-11.2.0-3.cm2.x86_64.rpm +gcc-c++-11.2.0-3.cm2.x86_64.rpm libpkgconf-1.8.0-2.cm2.x86_64.rpm pkgconf-1.8.0-2.cm2.x86_64.rpm pkgconf-m4-1.8.0-2.cm2.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 4fddef1bcc0..37259be39ac 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -87,16 +87,16 @@ flex-debuginfo-2.6.4-7.cm2.aarch64.rpm flex-devel-2.6.4-7.cm2.aarch64.rpm gawk-5.1.0-2.cm2.aarch64.rpm gawk-debuginfo-5.1.0-2.cm2.aarch64.rpm -gcc-11.2.0-2.cm2.aarch64.rpm -gcc-c++-11.2.0-2.cm2.aarch64.rpm -gcc-debuginfo-11.2.0-2.cm2.aarch64.rpm +gcc-11.2.0-3.cm2.aarch64.rpm +gcc-c++-11.2.0-3.cm2.aarch64.rpm +gcc-debuginfo-11.2.0-3.cm2.aarch64.rpm gdbm-1.21-1.cm2.aarch64.rpm gdbm-debuginfo-1.21-1.cm2.aarch64.rpm gdbm-devel-1.21-1.cm2.aarch64.rpm gdbm-lang-1.21-1.cm2.aarch64.rpm gettext-0.21-2.cm2.aarch64.rpm gettext-debuginfo-0.21-2.cm2.aarch64.rpm -gfortran-11.2.0-2.cm2.aarch64.rpm +gfortran-11.2.0-3.cm2.aarch64.rpm glib-2.71.0-1.cm2.aarch64.rpm glib-debuginfo-2.71.0-1.cm2.aarch64.rpm glib-devel-2.71.0-1.cm2.aarch64.rpm @@ -154,14 +154,14 @@ libcap-devel-2.26-2.cm2.aarch64.rpm libffi-3.4.2-2.cm2.aarch64.rpm libffi-debuginfo-3.4.2-2.cm2.aarch64.rpm libffi-devel-3.4.2-2.cm2.aarch64.rpm -libgcc-11.2.0-2.cm2.aarch64.rpm -libgcc-atomic-11.2.0-2.cm2.aarch64.rpm -libgcc-devel-11.2.0-2.cm2.aarch64.rpm +libgcc-11.2.0-3.cm2.aarch64.rpm +libgcc-atomic-11.2.0-3.cm2.aarch64.rpm +libgcc-devel-11.2.0-3.cm2.aarch64.rpm libgcrypt-1.9.4-1.cm2.aarch64.rpm libgcrypt-debuginfo-1.9.4-1.cm2.aarch64.rpm libgcrypt-devel-1.9.4-1.cm2.aarch64.rpm -libgomp-11.2.0-2.cm2.aarch64.rpm -libgomp-devel-11.2.0-2.cm2.aarch64.rpm +libgomp-11.2.0-3.cm2.aarch64.rpm +libgomp-devel-11.2.0-3.cm2.aarch64.rpm libgpg-error-1.43-2.cm2.aarch64.rpm libgpg-error-debuginfo-1.43-2.cm2.aarch64.rpm libgpg-error-devel-1.43-2.cm2.aarch64.rpm @@ -196,8 +196,8 @@ libsolv-tools-0.7.20-1.cm2.aarch64.rpm libssh2-1.9.0-2.cm2.aarch64.rpm libssh2-debuginfo-1.9.0-2.cm2.aarch64.rpm libssh2-devel-1.9.0-2.cm2.aarch64.rpm -libstdc++-11.2.0-2.cm2.aarch64.rpm -libstdc++-devel-11.2.0-2.cm2.aarch64.rpm +libstdc++-11.2.0-3.cm2.aarch64.rpm +libstdc++-devel-11.2.0-3.cm2.aarch64.rpm libtasn1-4.18.0-2.cm2.aarch64.rpm libtasn1-debuginfo-4.18.0-2.cm2.aarch64.rpm libtasn1-devel-4.18.0-2.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 2cd58b49017..3a007e01db5 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -87,16 +87,16 @@ flex-debuginfo-2.6.4-7.cm2.x86_64.rpm flex-devel-2.6.4-7.cm2.x86_64.rpm gawk-5.1.0-2.cm2.x86_64.rpm gawk-debuginfo-5.1.0-2.cm2.x86_64.rpm -gcc-11.2.0-2.cm2.x86_64.rpm -gcc-c++-11.2.0-2.cm2.x86_64.rpm -gcc-debuginfo-11.2.0-2.cm2.x86_64.rpm +gcc-11.2.0-3.cm2.x86_64.rpm +gcc-c++-11.2.0-3.cm2.x86_64.rpm +gcc-debuginfo-11.2.0-3.cm2.x86_64.rpm gdbm-1.21-1.cm2.x86_64.rpm gdbm-debuginfo-1.21-1.cm2.x86_64.rpm gdbm-devel-1.21-1.cm2.x86_64.rpm gdbm-lang-1.21-1.cm2.x86_64.rpm gettext-0.21-2.cm2.x86_64.rpm gettext-debuginfo-0.21-2.cm2.x86_64.rpm -gfortran-11.2.0-2.cm2.x86_64.rpm +gfortran-11.2.0-3.cm2.x86_64.rpm glib-2.71.0-1.cm2.x86_64.rpm glib-debuginfo-2.71.0-1.cm2.x86_64.rpm glib-devel-2.71.0-1.cm2.x86_64.rpm @@ -154,14 +154,14 @@ libcap-devel-2.26-2.cm2.x86_64.rpm libffi-3.4.2-2.cm2.x86_64.rpm libffi-debuginfo-3.4.2-2.cm2.x86_64.rpm libffi-devel-3.4.2-2.cm2.x86_64.rpm -libgcc-11.2.0-2.cm2.x86_64.rpm -libgcc-atomic-11.2.0-2.cm2.x86_64.rpm -libgcc-devel-11.2.0-2.cm2.x86_64.rpm +libgcc-11.2.0-3.cm2.x86_64.rpm +libgcc-atomic-11.2.0-3.cm2.x86_64.rpm +libgcc-devel-11.2.0-3.cm2.x86_64.rpm libgcrypt-1.9.4-1.cm2.x86_64.rpm libgcrypt-debuginfo-1.9.4-1.cm2.x86_64.rpm libgcrypt-devel-1.9.4-1.cm2.x86_64.rpm -libgomp-11.2.0-2.cm2.x86_64.rpm -libgomp-devel-11.2.0-2.cm2.x86_64.rpm +libgomp-11.2.0-3.cm2.x86_64.rpm +libgomp-devel-11.2.0-3.cm2.x86_64.rpm libgpg-error-1.43-2.cm2.x86_64.rpm libgpg-error-debuginfo-1.43-2.cm2.x86_64.rpm libgpg-error-devel-1.43-2.cm2.x86_64.rpm @@ -196,8 +196,8 @@ libsolv-tools-0.7.20-1.cm2.x86_64.rpm libssh2-1.9.0-2.cm2.x86_64.rpm libssh2-debuginfo-1.9.0-2.cm2.x86_64.rpm libssh2-devel-1.9.0-2.cm2.x86_64.rpm -libstdc++-11.2.0-2.cm2.x86_64.rpm -libstdc++-devel-11.2.0-2.cm2.x86_64.rpm +libstdc++-11.2.0-3.cm2.x86_64.rpm +libstdc++-devel-11.2.0-3.cm2.x86_64.rpm libtasn1-4.18.0-2.cm2.x86_64.rpm libtasn1-debuginfo-4.18.0-2.cm2.x86_64.rpm libtasn1-devel-4.18.0-2.cm2.x86_64.rpm