From 46f3cde3803a259481eb4e33a277b5b7d60cbe23 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 26 Aug 2026 09:06:59 +0300 Subject: [PATCH] bootstrap: build without the clang/llvm plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- SPECS/annobin.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec index c55b355..7054771 100644 --- a/SPECS/annobin.spec +++ b/SPECS/annobin.spec @@ -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}