import CS gcc-toolset-14-14.0-2.el9

This commit is contained in:
eabdullin 2025-09-15 11:59:04 +00:00
parent 66e03bcc6d
commit 0775e7d444
2 changed files with 6 additions and 52 deletions

View File

@ -1,41 +0,0 @@
#! /bin/bash
# Emulate /usr/bin/sudo, so that SCL environment variables
# are passed through via an /bin/env wrapper.
# Includes work by Andy Fong <boringuy@gmail.com>
cmd_started=false
is_option_param_next=false
for arg in "$@"
do
case "$arg" in
*\'*)
arg= ;;
esac
if [ "$cmd_started" = true ]; then
cmd_options="$cmd_options '$arg'"
elif [ "$is_option_param_next" = true ]; then
sudo_options="$sudo_options $arg"
is_option_param_next=false
elif [[ $arg == -* ]]; then
sudo_options="$sudo_options $arg"
case "$arg" in
# all the options that take a parameter
"-g" | "-h" | "-p" | "-u" | "-U" | "-C" | "-s" | "-r" | "-t" | "-T")
is_option_param_next=true
;;
"--")
cmd_started=true
;;
esac
elif [[ $arg == *=* ]]; then
sudo_options="$sudo_options $arg"
else
cmd_options="$cmd_options '$arg'"
cmd_started=true
fi
done
if [ "$sudo_options" == "" ]; then
sudo_options="-E"
fi
exec /usr/bin/sudo $sudo_options env LD_LIBRARY_PATH=$LD_LIBRARY_PATH PATH=$PATH scl enable %{scl} "$cmd_options"

View File

@ -8,13 +8,12 @@ BuildRequires: scl-utils-build
Summary: Package that installs %scl
Name: %scl_name
Version: 14.0
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: Applications/File
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: README
Source1: sudo.sh
Source2: gts-annobin-plugin-select.sh
Source1: gts-annobin-plugin-select.sh
Requires: %{scl_prefix}runtime
Requires: %{scl_prefix}gcc %{scl_prefix}gcc-c++ %{scl_prefix}gcc-gfortran
@ -106,12 +105,6 @@ export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir64\$rpmlibdir32\${LD_LI
export PKG_CONFIG_PATH=%{_libdir}/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}
EOF
# Sudo script
# ===========
cat <<'EOF' > sudo
%{expand:%(cat %{SOURCE1})}
EOF
%install
(%{scl_install})
@ -130,7 +123,6 @@ install -d -m 755 %{buildroot}%{_scl_scripts}
install -p -m 755 enable %{buildroot}%{_scl_scripts}/
install -d -m 755 %{buildroot}%{_scl_scripts}
install -p -m 755 sudo %{buildroot}%{_bindir}/
# Other directories that should be owned by the runtime
install -d -m 755 %{buildroot}%{_datadir}/appdata
@ -145,7 +137,7 @@ install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/
# Install the plugin selector trigger script.
mkdir -p %{buildroot}%{rrcdir}
install -p -m 755 %{SOURCE2} %{buildroot}%{rrcdir}/
install -p -m 755 %{SOURCE1} %{buildroot}%{rrcdir}/
# This trigger is used to decide which version of the annobin plugin for gcc
# should be used. See comments in the script for full details.
@ -191,6 +183,9 @@ if [ $1 = 0 ]; then
fi
%changelog
* Wed May 21 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 14.0-2
- Drop the sudo wrapper script (RHEL-90066)
* Wed Aug 14 2024 Marek Polacek <polacek@redhat.com> - 14.0-1
- don't require gdb on RHEL9 (RHEL-54245)