rpms
/
gcc-toolset-11
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

This commit is contained in:
CentOS Sources 2022-03-29 06:56:24 -04:00 committed by Stepan Oksanichenko
parent 549cd45801
commit a793741fc5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SPECS/gcc-toolset-11.spec
View File

@ -4,7 +4,7 @@
Summary: Package that installs %scl Summary: Package that installs %scl
Name: %scl_name Name: %scl_name
Version: 11.0 Version: 11.1
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/File Group: Applications/File
@ -123,7 +123,7 @@ help2man -N --section 7 ./h2m_helper -o %{?scl_name}.7
cat <<EOF >enable cat <<EOF >enable
# General environment variables # General environment variables
export PATH=%{_bindir}\${PATH:+:\${PATH}} export PATH=%{_bindir}\${PATH:+:\${PATH}}
export MANPATH=%{_mandir}:\${MANPATH} export MANPATH=%{_mandir}\${MANPATH:+:\${MANPATH}}
export INFOPATH=%{_infodir}\${INFOPATH:+:\${INFOPATH}} export INFOPATH=%{_infodir}\${INFOPATH:+:\${INFOPATH}}
export PCP_DIR=%{_scl_root} export PCP_DIR=%{_scl_root}
# bz847911 workaround: # bz847911 workaround:
@ -132,12 +132,17 @@ export PCP_DIR=%{_scl_root}
rpmlibdir=\$(rpm --eval "%%{_libdir}") rpmlibdir=\$(rpm --eval "%%{_libdir}")
# bz1017604: On 64-bit hosts, we should include also the 32-bit library path. # 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. # bz1873882: On 32-bit hosts, we should include also the 64-bit library path.
# bz2027377: Avoid unbound variables
if [ "\$rpmlibdir" != "\${rpmlibdir/lib64/}" ]; then if [ "\$rpmlibdir" != "\${rpmlibdir/lib64/}" ]; then
rpmlibdir32=":%{_scl_root}\${rpmlibdir/lib64/lib}" rpmlibdir32=":%{_scl_root}\${rpmlibdir/lib64/lib}"
dynpath32="\$rpmlibdir32/dyninst" dynpath32="\$rpmlibdir32/dyninst"
rpmlibdir64=
dynpath64=
else else
rpmlibdir64=":%{_scl_root}\${rpmlibdir/lib/lib64}" rpmlibdir64=":%{_scl_root}\${rpmlibdir/lib/lib64}"
dynpath64="\$rpmlibdir64/dyninst" dynpath64="\$rpmlibdir64/dyninst"
rpmlibdir32=
dynpath32=
fi fi
# Add SCL dyninst to LD_LIBRARY_PATH, both 64- and 32-bit paths. # 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}} 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 fi
%changelog %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 * Wed Jul 28 2021 Marek Polacek <polacek@redhat.com> - 11.0-1
- on 32-bit hosts, include also the 64-bit library path (#1986097) - on 32-bit hosts, include also the 64-bit library path (#1986097)