From d67d7348916e9fa130b23c9150dbc8c019ca2ed3 Mon Sep 17 00:00:00 2001 From: sergesanspaille Date: Jun 19 2019 06:46:48 +0000 Subject: Fix rhbz#1678240 --- diff --git a/compiler-rt.spec b/compiler-rt.spec index 559d7d3..25bf3e8 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -9,7 +9,7 @@ Name: compiler-rt Version: 8.0.0 -Release: 1%{?rc_ver:.rc%{rc_ver}}%{?dist} +Release: 2%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT @@ -73,9 +73,39 @@ done mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/ pushd %{buildroot}%{_libdir}/clang/%{version}/lib -for i in *.a *.syms *.so; do +for i in *.a *.so +do ln -s ../$i linux/$i done +popd + +# multilib support: also create symlink from lib to lib64 +# fixes rhbz#1678240 +%ifarch %{ix86} +%post +if test "`uname -m`" = x86_64 +then + cd %{_libdir}/clang/%{version}/lib + mkdir -p ../../../../lib64/clang/%{version}/lib + for i in *.a *.so + do + ln -s ../../../../%{_lib}/clang/%{version}/lib/$i ../../../../lib64/clang/%{version}/lib/$i + done +fi + +%preun + +if test "`uname -m`" = x86_64 +then + cd %{_libdir}/clang/%{version}/lib + for i in *.a *.so + do + rm ../../../../lib64/clang/%{version}/lib/$i + done + rmdir -p ../../../../lib64/clang/%{version}/lib 2>/dev/null 1>/dev/null || : +fi + +%endif %check #make check-all -C _build @@ -85,6 +115,9 @@ done %{_libdir}/clang/%{version} %changelog +* Tue Jun 18 2019 sguelton@redhat.com - 8.0.0-2 +- Fix rhbz#1678240 + * Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1 - 8.0.0 final