From afb29d7d9fef095953f1b7589272215ce810bb84 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Sun, 26 Jul 2020 08:56:46 +0100
Subject: [PATCH] Disable annobin to allow rebuild.

---
 annobin.spec | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index 842e2b8..1009c39 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -46,7 +46,7 @@ License: GPLv3+
 # The problem should now only arise when rebasing to a new major version
 # of gcc, in which case the undefine below can be temporarily reinstated.
 #
-# %%undefine _annotated_build
+%undefine _annotated_build
 
 #---------------------------------------------------------------------------------
 
@@ -239,12 +239,26 @@ BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so -fplugin-arg-tmp_annobin-rename
 make -C gcc-plugin CXXFLAGS="%{optflags} $BUILD_FLAGS"
 rm %{_tmppath}/tmp_annobin.so
 
+%if %{with clangplugin}
+# FIXME: The symbolic link should not be needed.
+ln -f -s ../annobin-global.h clang-plugin
+make -C clang-plugin annobin.so 
+%endif
+
 #---------------------------------------------------------------------------------
 
 %install
 %make_install
 rm -f %{buildroot}%{_infodir}/dir
 
+%if %{with clangplugin}
+install -Dpm0755 -t %{buildroot}%{ANNOBIN_CLANG_PLUGIN_DIR} clang-plugin/annobin.so
+%endif
+
+%if %{with llvmplugin}
+#FIXME: ADD INSTALL
+%endif
+
 #---------------------------------------------------------------------------------
 
 %if %{with tests}
@@ -257,8 +271,13 @@ if [ -f tests/test-suite.log ]; then
 fi
 
 %if %{with clangplugin}
-# FIXME: Add tests of the clang plugin.
+# FIXME: RUN clang tests.
 %endif
+
+%if %{with llvmplugin}
+#FIXME: RUN LLVM tests.
+%endif
+
 %endif
 
 #---------------------------------------------------------------------------------
@@ -292,6 +311,9 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Sun Jul 26 2020 Nick Clifton <nickc@redhat.com> - 9.23-3
+- Rebuild without using annobin itself.
+
 * Sat Jul 25 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 9.23-2
 - Rebuild for gcc 10.2