From b099736f2914717228d2eb04873abd9f3587be40 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 22 2020 17:21:41 +0000 Subject: import gcc-toolset-10-annobin-9.21-3.el8 --- diff --git a/SPECS/annobin.spec b/SPECS/annobin.spec index 7899453..aacd7b1 100644 --- a/SPECS/annobin.spec +++ b/SPECS/annobin.spec @@ -5,7 +5,7 @@ Name: %{?scl_prefix}annobin Summary: Annotate and examine compiled binary files Version: 9.21 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ # ProtocolURL: https://fedoraproject.org/wiki/Toolchain/Watermark # Maintainer: nickc@redhat.com @@ -174,14 +174,14 @@ hardening options. #--------------------------------------------------------------------------------- -%global ANNOBIN_GCC_PLUGIN_DIR %(gcc --print-file-name=plugin) +%global ANNOBIN_GCC_PLUGIN_DIR %(%gcc_for_annobin --print-file-name=plugin) %if %{with clangplugin} # FIXME: Clang does not appear to have an official plugin directory. # Instead it just uses dlopen() with no pathname prefix. So we # construct a (hopefully good) path and rely upon users of annobin # knowing about this location. -%global ANNOBIN_CLANG_PLUGIN_DIR /usr/lib64/clang/%(clang -dumpversion)/lib +%global ANNOBIN_CLANG_PLUGIN_DIR %{?scl_prefix}/usr/lib64/clang/%(clang -dumpversion)/lib %endif #--------------------------------------------------------------------------------- @@ -305,6 +305,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Jun 10 2020 Nick Clifton - 9.21-3 +- Fix the computations of ANNOBIN_GCC_PLUGIN_DIR and ANNOBIN_CLANG_PLUGIN_DIR. + * Fri Jun 05 2020 Nick Clifton - 9.21-2 - NVR bump to allow rebuild.