import gcc-toolset-11-11.1-1.el8

This commit is contained in:
CentOS Sources 2022-05-10 03:11:18 -04:00 committed by Stepan Oksanichenko
parent 903c859441
commit f776328ce7

View File

@ -4,7 +4,7 @@
Summary: Package that installs %scl
Name: %scl_name
Version: 11.0
Version: 11.1
Release: 1%{?dist}
License: GPLv2+
Group: Applications/File
@ -123,7 +123,7 @@ help2man -N --section 7 ./h2m_helper -o %{?scl_name}.7
cat <<EOF >enable
# General environment variables
export PATH=%{_bindir}\${PATH:+:\${PATH}}
export MANPATH=%{_mandir}:\${MANPATH}
export MANPATH=%{_mandir}\${MANPATH:+:\${MANPATH}}
export INFOPATH=%{_infodir}\${INFOPATH:+:\${INFOPATH}}
export PCP_DIR=%{_scl_root}
# bz847911 workaround:
@ -132,12 +132,17 @@ export PCP_DIR=%{_scl_root}
rpmlibdir=\$(rpm --eval "%%{_libdir}")
# bz1017604: On 64-bit hosts, we should include also the 32-bit library path.
# bz1873882: On 32-bit hosts, we should include also the 64-bit library path.
# 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}}
@ -213,6 +218,12 @@ if [ $1 = 0 ]; then
fi
%changelog
* Fri Dec 17 2021 Marek Polacek <polacek@redhat.com> - 11.1-1
- fix unbound variables in 'MANPATH' (#2027377)
* Mon Nov 29 2021 Marek Polacek <polacek@redhat.com> - 11.1-0
- fix unbound variables in 'enable' (#2027377)
* Wed Jul 28 2021 Marek Polacek <polacek@redhat.com> - 11.0-1
- on 32-bit hosts, include also the 64-bit library path (#1986097)