| 1 |
commit: 3672c0bb4b579855240ede0b471aaf453cbbf44e |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Mar 31 20:25:35 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Mar 31 21:35:03 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3672c0bb |
| 7 |
|
| 8 |
dev-util/annobin: new version |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
dev-util/annobin/Manifest | 2 +- |
| 13 |
.../{annobin-10.58.ebuild => annobin-10.60.ebuild} | 26 +++++++++++++--------- |
| 14 |
2 files changed, 17 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest |
| 17 |
index 65bf6bb5a..a38c6d64b 100644 |
| 18 |
--- a/dev-util/annobin/Manifest |
| 19 |
+++ b/dev-util/annobin/Manifest |
| 20 |
@@ -1 +1 @@ |
| 21 |
-DIST annobin-10.58.tar.xz 846744 BLAKE2B 86a7beb46d7fce153f44d2a42e538ff99d40de239655f001580e34c8e0f40fe4309b908681047d012dc315977a93889f9e4e05f00a97145c5c04663d5f239fb8 SHA512 7d40fe9ddbee788db3331ec138aa588936d726ec50e0286b23be3792f20c2fc111c635b70598e0d8b6ba24a92de514fc637d5cea6b9d7781de781fbf244dfbd8 |
| 22 |
+DIST annobin-10.60.tar.xz 848432 BLAKE2B df7dafd25af009bf0cbe779088892bd11120cf99f587293f7730083007586d84c452737d4e3b32e2b73586ab51958ba8f16d358cef9041ccb493198e72bc1b37 SHA512 7d5158da6a59000d686fb837b0ac1a86351898c00a93e29c2cb599ec6eccb325b66fbd775855bd3661d2d9541e3d2cb2493b087b6670fca137f9992f33c68082 |
| 23 |
|
| 24 |
diff --git a/dev-util/annobin/annobin-10.58.ebuild b/dev-util/annobin/annobin-10.60.ebuild |
| 25 |
similarity index 78% |
| 26 |
rename from dev-util/annobin/annobin-10.58.ebuild |
| 27 |
rename to dev-util/annobin/annobin-10.60.ebuild |
| 28 |
index 0b10a8cac..2a3dfe7f1 100644 |
| 29 |
--- a/dev-util/annobin/annobin-10.58.ebuild |
| 30 |
+++ b/dev-util/annobin/annobin-10.60.ebuild |
| 31 |
@@ -3,6 +3,8 @@ |
| 32 |
|
| 33 |
EAPI=8 |
| 34 |
|
| 35 |
+LLVM_MAX_SLOT=14 |
| 36 |
+ |
| 37 |
inherit autotools llvm toolchain-funcs |
| 38 |
|
| 39 |
DESCRIPTION="Binary annotation compiler plugin and tools" |
| 40 |
@@ -19,23 +21,26 @@ RDEPEND=" |
| 41 |
dev-libs/elfutils |
| 42 |
sys-libs/binutils-libs |
| 43 |
|
| 44 |
- clang? ( <sys-devel/clang-13:= ) |
| 45 |
- !clang? ( llvm? ( <sys-devel/llvm-13:= ) ) |
| 46 |
+ clang? ( <sys-devel/clang-${LLVM_MAX_SLOT}:= ) |
| 47 |
+ !clang? ( llvm? ( <sys-devel/llvm-${LLVM_MAX_SLOT}:= ) ) |
| 48 |
llvm? ( |
| 49 |
|| ( |
| 50 |
sys-devel/llvm:11 |
| 51 |
sys-devel/llvm:12 |
| 52 |
sys-devel/llvm:13 |
| 53 |
+ sys-devel/llvm:${LLVM_MAX_SLOT} |
| 54 |
) |
| 55 |
) |
| 56 |
" |
| 57 |
DEPEND="${RDEPEND}" |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
- "${FILESDIR}/${P}-fix-bashism.patch" |
| 61 |
- "${FILESDIR}/${P}-demangle.h-path.patch" |
| 62 |
+ "${FILESDIR}/${PN}-10.58-fix-bashism.patch" |
| 63 |
+ "${FILESDIR}/${PN}-10.58-demangle.h-path.patch" |
| 64 |
) |
| 65 |
-REQUIRED_USE="clang? ( llvm )" |
| 66 |
+REQUIRED_USE=" |
| 67 |
+ clang? ( llvm ) |
| 68 |
+" |
| 69 |
RESTRICT="!test? ( test )" |
| 70 |
|
| 71 |
pkg_pretend() { |
| 72 |
@@ -52,17 +57,16 @@ src_prepare() { |
| 73 |
sed -i 's|2.69|2.71|g' config/override.m4 || die |
| 74 |
|
| 75 |
if use llvm; then |
| 76 |
- local llvmdir="$(get_llvm_prefix -d)" |
| 77 |
+ local llvmdir="$(get_llvm_prefix -d)" || die |
| 78 |
local llvm_plugindir |
| 79 |
llvm_plugindir="$( |
| 80 |
clang --print-search-dirs | gawk -e\ |
| 81 |
'BEGIN { FS = ":" } /libraries/ { print gensub(" =","",1,$2) } END { }' |
| 82 |
- )" |
| 83 |
+ )" || die |
| 84 |
einfo $llvm_plugindir |
| 85 |
|
| 86 |
sed -i "/^INCDIR.*/ s|$| -I${llvmdir}/include|" {llvm,clang}-plugin/Makefile.in || die |
| 87 |
sed -i "/^CLANG_LIBS.*/ s|$| -L${llvmdir}/$(get_libdir)|" clang-plugin/Makefile.in || die |
| 88 |
- sed -i 's/print-seach-dirs/print-search-dirs/g' {llvm,clang}-plugin/Makefile.in || die |
| 89 |
sed -i "s|^PLUGIN_INSTALL_DIR =.*|PLUGIN_INSTALL_DIR = \$\{DESTDIR\}/$(realpath ${llvm_plugindir})|" {llvm,clang}-plugin/Makefile.in || die |
| 90 |
fi |
| 91 |
|
| 92 |
@@ -70,14 +74,16 @@ src_prepare() { |
| 93 |
} |
| 94 |
|
| 95 |
src_configure() { |
| 96 |
+ local plugdir="$($(tc-getCC) -print-file-name=plugin)" || die |
| 97 |
local myconf=( |
| 98 |
+ --with-gcc-plugin-dir="${plugdir}" |
| 99 |
--with-libelf |
| 100 |
- --with-gcc-plugin-dir=$($(tc-getCC) -print-file-name=plugin) |
| 101 |
--without-debuginfod # we don't have it enabled, comes with elfutils |
| 102 |
$(use_with clang) |
| 103 |
+ $(use_with doc docs) |
| 104 |
$(use_with llvm) |
| 105 |
$(use_with test tests) |
| 106 |
- $(use_with doc docs) |
| 107 |
) |
| 108 |
+ |
| 109 |
econf "${myconf[@]}" |
| 110 |
} |
Archives