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

Disable annobin to allow rebuild.

Browse Source
This commit is contained in:
Nick Clifton 2020-07-26 08:56:46 +01:00
parent 229003f625
commit afb29d7d9f
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
annobin.spec
View File

@ -46,7 +46,7 @@ License: GPLv3+
# The problem should now only arise when rebasing to a new major version # 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. # 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" make -C gcc-plugin CXXFLAGS="%{optflags} $BUILD_FLAGS"
rm %{_tmppath}/tmp_annobin.so 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 %install
%make_install %make_install
rm -f %{buildroot}%{_infodir}/dir 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} %if %{with tests}
@ -257,8 +271,13 @@ if [ -f tests/test-suite.log ]; then
fi fi
%if %{with clangplugin} %if %{with clangplugin}
# FIXME: Add tests of the clang plugin. # FIXME: RUN clang tests.
%endif %endif
%if %{with llvmplugin}
#FIXME: RUN LLVM tests.
%endif
%endif %endif
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
@ -292,6 +311,9 @@ fi
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
%changelog %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 * Sat Jul 25 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 9.23-2
- Rebuild for gcc 10.2 - Rebuild for gcc 10.2