diff --git a/annobin.spec b/annobin.spec index 46c6bb9..2c67fe8 100644 --- a/annobin.spec +++ b/annobin.spec @@ -9,7 +9,7 @@ BuildRequires: scl-utils-build Name: %{?scl_prefix}annobin Summary: Annotate and examine compiled binary files Version: 12.67 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -107,7 +107,7 @@ BuildRequires: %{scl_prefix}annobin-plugin-gcc BuildRequires: %scl_runtime Requires: %scl_runtime -# We need the gcc-toolset-N version of gcc in order run annobin, as otherwise the versions will not match. +# We need the gcc-toolset-N version of gcc in order to run annobin, as otherwise the versions will not match. Requires: %scl_require_package %{scl} gcc %define gcc_for_annobin %{_scl_root}/usr/bin/gcc @@ -369,7 +369,7 @@ Installs an annobin plugin that can be used by Clang. %global GTS_GCC_MAJOR_VERSION 14 -%global ANNOBIN_GCC_PLUGIN_DIR %{_scl_root}/usr/lib/gcc/x86_64-redhat-linux/%{GTS_GCC_MAJOR_VERSION}/plugin +%global ANNOBIN_GCC_PLUGIN_DIR %{_scl_root}/usr/lib/gcc/%{_target_platform}/%{GTS_GCC_MAJOR_VERSION}/plugin %else @@ -622,6 +622,10 @@ make check GCC=%gcc_for_annobin #--------------------------------------------------------------------------------- %changelog +* Thu Aug 08 2024 Nick Clifton - 12.67-2 +- Spec File: Use correct directory for plugin installation. (RHEL-53210) +- Spec File: Disable plugin when running on wrong major version of the compiler. + * Wed Aug 07 2024 Nick Clifton - 12.67-1 - Annocheck: Stop spurious assembler warnings. (RHEL-53213) - Annocheck: Stop warnings about known gaps. (RHEL-53218)