From 4929c2ad2ef6fa47a950afb429e19bbb504784aa Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mon, 30 May 2022 18:12:20 +0000 Subject: [PATCH] import gcc-toolset-12-12.0-3.el8 --- SOURCES/README | 7 +--- SPECS/gcc-toolset-12.spec | 75 ++++++++++----------------------------- 2 files changed, 19 insertions(+), 63 deletions(-) diff --git a/SOURCES/README b/SOURCES/README index 2b5edfc..585e9f7 100644 --- a/SOURCES/README +++ b/SOURCES/README @@ -1,12 +1,7 @@ Package %{scl_name} is the main package for Red Hat GCC Toolset 12. By installing the %{scl_name} package, you will get the working set of packages that are included in Red Hat GCC -Toolset 12. It is possible to install only certain components, -such as the toolchain packages used to develop and debug -applications, since this package contains a number of meta packages. -These are: %{scl_name}-perftools, which includes performance -monitoring tools; and %{scl_name}-toolchain, which includes -development and debugging tools. +Toolset 12, which includes development and debugging tools. Usage: scl enable %{scl} diff --git a/SPECS/gcc-toolset-12.spec b/SPECS/gcc-toolset-12.spec index 98eb422..8386a53 100644 --- a/SPECS/gcc-toolset-12.spec +++ b/SPECS/gcc-toolset-12.spec @@ -5,15 +5,18 @@ Summary: Package that installs %scl Name: %scl_name Version: 12.0 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/File BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: README Source1: sudo.sh -# The base package requires just the toolchain and the perftools. -Requires: %{scl_prefix}toolchain %{scl_prefix}perftools +Requires: %{scl_prefix}runtime +Requires: %{scl_prefix}gcc %{scl_prefix}gcc-c++ %{scl_prefix}gcc-gfortran +Requires: %{scl_prefix}binutils +Requires: %{scl_prefix}gdb +Requires: %{scl_prefix}dwz Obsoletes: %{name} < %{version}-%{release} Obsoletes: %{scl_prefix}dockerfiles < %{version}-%{release} @@ -53,47 +56,6 @@ Obsoletes: %{name}-build < %{version}-%{release} %description build Package shipping essential configuration macros to build %scl Software Collection. -%package toolchain -Summary: Package shipping basic toolchain applications -Group: Applications/File -Requires: %{scl_prefix}runtime -Requires: %{scl_prefix}gcc %{scl_prefix}gcc-c++ %{scl_prefix}gcc-gfortran -Requires: %{scl_prefix}binutils %{scl_prefix}gdb %{scl_prefix}strace -Requires: %{scl_prefix}dwz %{scl_prefix}elfutils -Requires: %{scl_prefix}ltrace %{scl_prefix}make -Requires: %{scl_prefix}annobin -%if 0%{?rhel} <= 7 -Requires: %{scl_prefix}memstomp -%endif -Obsoletes: %{name}-toolchain < %{version}-%{release} - -%description toolchain -Package shipping basic toolchain applications (compiler, debugger, ...) - -%package perftools -Summary: Package shipping performance tools -Group: Applications/File -Requires: %{scl_prefix}runtime -Requires: %{scl_prefix}systemtap %{scl_prefix}valgrind -%if 0%{?rhel} <= 7 -Requires: %{scl_prefix}oprofile -%ifarch x86_64 -Requires: %{scl_prefix}dyninst -%endif -%else -%ifarch x86_64 ppc64le aarch64 -Requires: %{scl_prefix}dyninst -%endif -%endif -Obsoletes: %{name}-perftools < %{version}-%{release} - -%description perftools -%if 0%{?rhel} <= 7 -Package shipping performance tools (systemtap, oprofile) -%else -Package shipping performance tools (systemtap) -%endif - %prep %setup -c -T @@ -125,6 +87,7 @@ cat <enable export PATH=%{_bindir}\${PATH:+:\${PATH}} export MANPATH=%{_mandir}\${MANPATH:+:\${MANPATH}} export INFOPATH=%{_infodir}\${INFOPATH:+:\${INFOPATH}} +# ??? We probably don't need this anymore. export PCP_DIR=%{_scl_root} # bz847911 workaround: # we need to evaluate rpm's installed run-time % { _libdir }, not rpmbuild time @@ -135,18 +98,12 @@ rpmlibdir=\$(rpm --eval "%%{_libdir}") # bz2027377: Avoid unbound variables if [ "\$rpmlibdir" != "\${rpmlibdir/lib64/}" ]; then rpmlibdir32=":%{_scl_root}\${rpmlibdir/lib64/lib}" - dynpath32="\$rpmlibdir32/dyninst" rpmlibdir64= - dynpath64= else rpmlibdir64=":%{_scl_root}\${rpmlibdir/lib/lib64}" - dynpath64="\$rpmlibdir64/dyninst" rpmlibdir32= - dynpath32= fi -# Add SCL dyninst to LD_LIBRARY_PATH, both 64- and 32-bit paths. -export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir/dyninst\$dynpath64\$dynpath32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}} -# Now prepend the usual /opt/.../usr/lib{64,}. +# Prepend the usual /opt/.../usr/lib{64,}. export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir64\$rpmlibdir32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}} export PKG_CONFIG_PATH=%{_libdir}/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}} EOF @@ -161,7 +118,7 @@ EOF (%{scl_install}) # This allows users to build packages using DTS/GTS. -cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config << EOF +cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-enable << EOF %%enable_devtoolset12 %%global ___build_pre %%{___build_pre}; source scl_source enable %{scl} || : EOF @@ -190,16 +147,13 @@ install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/ %files runtime %scl_files +%{_root_sysconfdir}/rpm/macros.%{scl}-enable %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/selinux-equiv.created %dir %{_scl_root}/etc/alternatives %dir %{_datadir}/appdata %files build -%{_root_sysconfdir}/rpm/macros.%{scl}* - -%files toolchain - -%files perftools +%{_root_sysconfdir}/rpm/macros.%{scl}-config %post runtime if [ ! -f %{_sysconfdir}/selinux-equiv.created ]; then @@ -218,6 +172,13 @@ if [ $1 = 0 ]; then fi %changelog +* Fri May 27 2022 Marek Polacek - 12.0-3 +- use rpm/macros.%{scl}-enable for %enable_devtoolset12 and put it in + the -runtime subpackage (#2009528) + +* Fri May 27 2022 Marek Polacek - 12.0-2 +- cut down the required packages, remove -toolchain and -perftools + * Mon May 16 2022 Martin Cermak - 12.0-1 - NVR bump and rebuild, introduce CI gating setup