bootstrap: build without the clang/llvm plugins
The clang/llvm plugins pin annobin to a specific libLLVM soname, which deadlocks the buildroot when llvm is rebased: the chroot cannot update llvm while the installed annobin requires the old libLLVM, and annobin cannot be erased because redhat-rpm-config requires it. Disable both plugins on this branch and pass the negative configure flags as well — the spec only ever passed --with-clang/--with-llvm, so configure kept looking for clang++ and failed when the bconds were turned off. Build this branch first, then rebuild annobin from c9-beta against the new llvm.
This commit is contained in:
parent
7171895bfb
commit
46f3cde380
@ -25,13 +25,13 @@ URL: https://sourceware.org/annobin/
|
||||
%bcond_with debuginfod
|
||||
|
||||
# Use "--without clangplugin" to disable the building of the annobin plugin for Clang.
|
||||
%bcond_without clangplugin
|
||||
%bcond_with clangplugin
|
||||
|
||||
# Use "--without gccplugin" to disable the building of the annobin plugin for GCC.
|
||||
%bcond_without gccplugin
|
||||
|
||||
# Use "--without llvmplugin" to disable the building of the annobin plugin for LLVM.
|
||||
%bcond_without llvmplugin
|
||||
%bcond_with llvmplugin
|
||||
|
||||
# Set this to zero to disable the requirement for a specific version of gcc.
|
||||
# This should only be needed if there is some kind of problem with the version
|
||||
@ -225,6 +225,8 @@ CONFIG_ARGS="$CONFIG_ARGS --without-debuginfod"
|
||||
|
||||
%if %{with clangplugin}
|
||||
CONFIG_ARGS="$CONFIG_ARGS --with-clang"
|
||||
%else
|
||||
CONFIG_ARGS="$CONFIG_ARGS --without-clang"
|
||||
%endif
|
||||
|
||||
%if %{without gccplugin}
|
||||
@ -233,6 +235,8 @@ CONFIG_ARGS="$CONFIG_ARGS --without-gcc-plugin"
|
||||
|
||||
%if %{with llvmplugin}
|
||||
CONFIG_ARGS="$CONFIG_ARGS --with-llvm"
|
||||
%else
|
||||
CONFIG_ARGS="$CONFIG_ARGS --without-llvm"
|
||||
%endif
|
||||
|
||||
%if %{without tests}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user