rpms/ghc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add ld.so.conf for bundled aarch64 llvm libs

Browse Source
This commit is contained in:
Jens Petersen 2021-06-22 23:05:26 +08:00 committed by Stepan Oksanichenko
parent 9904ba9762
commit 58b410ac68
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ghc.metadata Normal file
View File

@ -0,0 +1,2 @@
ff17fba025a6cfe99affd1163f9bf82178556fd2 ghc-8.8.4-src.tar.xz.sig
94dfb44d8f6b812a7023309ec909e2288f0e7724 ghc-8.8.4-src.tar.xz

12
ghc.spec
View File

@ -44,7 +44,7 @@ Version: 8.8.4
# - release can only be reset if *all* library versions get bumped simultaneously # - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release) # (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically # - minor release numbers for a branch should be incremented monotonically
Release: 112%{?dist} Release: 113%{?dist}
Summary: Glasgow Haskell Compiler Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport License: BSD and HaskellReport
@ -555,6 +555,12 @@ sed -i -e "s!$PWD/llvm-%{llvm_version}.src/_build!%{ghclibdir}/llvm!" %{buildroo
# Remove opt-viewer, since this is just a compatibility package. # Remove opt-viewer, since this is just a compatibility package.
rm -r %{buildroot}%{ghclibdir}/llvm/share/opt-viewer rm -r %{buildroot}%{ghclibdir}/llvm/share/opt-viewer
# Create ld.so.conf.d entry
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
%{ghclibdir}/llvm/lib
EOF
%endif %endif
@ -661,6 +667,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%{ghclibdir}/bin/ghc-iserv-dyn %{ghclibdir}/bin/ghc-iserv-dyn
%ifarch %{ghc_llvm_archs} %ifarch %{ghc_llvm_archs}
%license llvm-%{llvm_version}.src/LICENSE.TXT %license llvm-%{llvm_version}.src/LICENSE.TXT
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%{ghclibdir}/llvm %{ghclibdir}/llvm
%endif %endif
%if %{with ghc_prof} %if %{with ghc_prof}
@ -738,6 +745,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog %changelog
* Tue Jun 22 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-113
- add ld.so.conf for bundled aarch64 llvm libs (#1918080)
* Sat Jun 19 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-112 * Sat Jun 19 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-112
- remove llvm opt-viewer since it uses python2.7 - remove llvm opt-viewer since it uses python2.7
- use LLC and OPT to configure llvm paths - use LLC and OPT to configure llvm paths