Skip to content

Fix compiling LLVM16, revert unneeded patches #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix compiling LLVM16, revert unneeded patches #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4eb9a9b
Revert "Fix compiling clang on i486"
direc85 Jun 13, 2024
afb389a
[llvm] Changed binaries in clang 16
direc85 Jun 13, 2024
38fd43e
[llvm] Fix hardcoded lib dir
direc85 Jun 13, 2024
6b95e9f
[llvm] Remove unneeded atomic patches due to updated GCC
direc85 Jun 13, 2024
ff09764
[llvm] Use identical %prep blocks
direc85 Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions rpm/0005-Disable-out-of-line-atomics-on-MeeGo.patch
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions rpm/clang.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
%global patch_ver 6

%global clang_tools_binaries \
%{_bindir}/amdgpu-arch \
%{_bindir}/clang-apply-replacements \
%{_bindir}/clang-change-namespace \
%{_bindir}/clang-check \
%{_bindir}/clang-doc \
%{_bindir}/clang-extdef-mapping \
%{_bindir}/clang-format \
%{_bindir}/clang-include-cleaner \
%{_bindir}/clang-include-fixer \
%{_bindir}/clang-linker-wrapper \
%{_bindir}/clang-move \
%{_bindir}/clang-nvlink-wrapper \
%{_bindir}/clang-offload-bundler \
%{_bindir}/clang-offload-packager \
%{_bindir}/clang-offload-wrapper \
%{_bindir}/clang-pseudo \
%{_bindir}/clang-query \
%{_bindir}/clang-refactor \
Expand All @@ -27,6 +27,7 @@
%{_bindir}/clangd \
%{_bindir}/diagtool \
%{_bindir}/hmaptool \
%{_bindir}/nvptx-arch \
%{_bindir}/pp-trace \
%{_bindir}/run-clang-tidy

Expand All @@ -50,7 +51,6 @@ Patch1: 0001-LLVM-Add-MeeGo-vendor-type.patch
Patch2: 0002-Add-Triple-isMeeGo.patch
Patch3: 0003-Clang-SailfishOS-toolchain.patch
Patch4: 0004-Make-funwind-tables-the-default-for-all-archs.patch
Patch5: 0005-Disable-out-of-line-atomics-on-MeeGo.patch

BuildRequires: gcc
BuildRequires: gcc-c++
Expand Down Expand Up @@ -153,7 +153,7 @@ pushd build
%endif
-DCLANG_INCLUDE_TESTS:BOOL=OFF \
-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
%ifarch aarch64
%if 0%{?__isa_bits} == 64
-DLLVM_LIBDIR_SUFFIX=64 \
%else
-DLLVM_LIBDIR_SUFFIX= \
Expand Down Expand Up @@ -188,7 +188,7 @@ pushd clang
mkdir -p %{buildroot}%{python3_sitelib}/clang/

# install scanbuild-py to python sitelib.
mv %{buildroot}%{_prefix}/lib/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
mv %{buildroot}%{_libdir}/{libear,libscanbuild} %{buildroot}%{python3_sitelib}

# remove editor integrations (bbedit, sublime, emacs, vim)
rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript
Expand Down
4 changes: 3 additions & 1 deletion rpm/llvm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Patch1: 0001-LLVM-Add-MeeGo-vendor-type.patch
Patch2: 0002-Add-Triple-isMeeGo.patch
Patch3: 0003-Clang-SailfishOS-toolchain.patch
Patch4: 0004-Make-funwind-tables-the-default-for-all-archs.patch
Patch5: 0005-Disable-out-of-line-atomics-on-MeeGo.patch

Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Expand Down Expand Up @@ -56,6 +55,9 @@ LLVM Header files
%prep
%autosetup -p1 -n %{name}-%{version}/%{name}

# symlink clang extra tools to enable build
ln -s ../../clang-tools-extra clang/tools/extra || :

%build
pushd llvm

Expand Down