Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add minimal sensible gcc dependencies #2716

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add minimal sensible gcc dependencies #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba77ee
Add sensible dependencies to gcc package
bossmc Apr 12, 2022
6af12c8
Update toolchain manifests
bossmc Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions SPECS/gcc/gcc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -268,6 +270,9 @@ make %{?_smp_mflags} check-gcc
%{_lib64dir}/libgomp.spec

%changelog
* Tue Apr 12 2022 Andy Caldwell <[email protected]> - 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 <[email protected]> - 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)
Expand Down
18 changes: 9 additions & 9 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
bossmc marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down