Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/creduce/, dev-util/creduce/files/
Date: Sun, 21 Apr 2019 12:37:56
Message-Id: 1555850253.d2f1a1a720e33f2448697e190c53ca56d937b946.mgorny@gentoo
1 commit: d2f1a1a720e33f2448697e190c53ca56d937b946
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 21 12:23:42 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 21 12:37:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f1a1a7
7
8 dev-util/creduce: Bump to 2.8.0
9
10 Closes: https://bugs.gentoo.org/683356
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 dev-util/creduce/Manifest | 1 +
14 dev-util/creduce/creduce-2.8.0.ebuild | 41 ++++++++++++++++++++++
15 .../creduce/files/creduce-2.8.0-link-libs.patch | 31 ++++++++++++++++
16 3 files changed, 73 insertions(+)
17
18 diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
19 index fdc206e410f..344546cbdd9 100644
20 --- a/dev-util/creduce/Manifest
21 +++ b/dev-util/creduce/Manifest
22 @@ -1,2 +1,3 @@
23 DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
24 +DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
25 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
26
27 diff --git a/dev-util/creduce/creduce-2.8.0.ebuild b/dev-util/creduce/creduce-2.8.0.ebuild
28 new file mode 100644
29 index 00000000000..5d6570d88f6
30 --- /dev/null
31 +++ b/dev-util/creduce/creduce-2.8.0.ebuild
32 @@ -0,0 +1,41 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI="6"
37 +
38 +: ${CMAKE_MAKEFILE_GENERATOR=ninja}
39 +inherit cmake-utils llvm
40 +
41 +DESCRIPTION="C-Reduce - a plugin-based C program reducer"
42 +HOMEPAGE="https://embed.cs.utah.edu/creduce/"
43 +SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
44 +
45 +LICENSE="UoI-NCSA"
46 +SLOT="0"
47 +KEYWORDS="~amd64 ~x86"
48 +IUSE=""
49 +
50 +LLVM_MAX_SLOT=7
51 +
52 +COMMON_DEPEND="
53 + >=dev-lang/perl-5.10.0
54 + sys-devel/clang:${LLVM_MAX_SLOT}"
55 +RDEPEND="${COMMON_DEPEND}
56 + dev-perl/Benchmark-Timer
57 + dev-perl/Exporter-Lite
58 + dev-perl/File-Which
59 + dev-perl/Getopt-Tabular
60 + dev-perl/Regexp-Common
61 + dev-perl/Sys-CPU
62 + dev-util/astyle
63 + dev-util/indent"
64 +DEPEND="${COMMON_DEPEND}"
65 +
66 +PATCHES=(
67 + "${FILESDIR}"/creduce-llvm-7.patch
68 + "${FILESDIR}"/creduce-2.8.0-link-libs.patch
69 +)
70 +
71 +llvm_check_deps() {
72 + has_version "sys-devel/clang:${LLVM_SLOT}"
73 +}
74
75 diff --git a/dev-util/creduce/files/creduce-2.8.0-link-libs.patch b/dev-util/creduce/files/creduce-2.8.0-link-libs.patch
76 new file mode 100644
77 index 00000000000..25e9ef22916
78 --- /dev/null
79 +++ b/dev-util/creduce/files/creduce-2.8.0-link-libs.patch
80 @@ -0,0 +1,31 @@
81 +From 885a675474d93ae4ef929de7520d3ac38ba39156 Mon Sep 17 00:00:00 2001
82 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
83 +Date: Sun, 21 Apr 2019 14:20:34 +0200
84 +Subject: [PATCH] Revert "Do not list `LLVM_LIBS` in the
85 + `target_link_libraries`."
86 +
87 +This breaks linking against shared LLVM.
88 +---
89 + clang_delta/CMakeLists.txt | 6 +-----
90 + 1 file changed, 1 insertion(+), 5 deletions(-)
91 +
92 +diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt
93 +index 6493abf..ab1dc42 100644
94 +--- a/clang_delta/CMakeLists.txt
95 ++++ b/clang_delta/CMakeLists.txt
96 +@@ -242,11 +242,7 @@ add_executable(clang_delta
97 + git_version.h
98 + )
99 +
100 +-# ENE, LLVM 6.0: LLVM_LIBS end up in the link command line anyway. I'm not
101 +-# quite sure why! But if you list LLVM_LIBS here, the `clang_delta' binary
102 +-# can end up with dynamic link errors when it runs (multiply defined symbols).
103 +-#
104 +-target_link_libraries(clang_delta ${CLANG_LIBS})
105 ++target_link_libraries(clang_delta ${CLANG_LIBS} ${LLVM_LIBS})
106 +
107 + # Custom target for running clang_delta tests
108 + #
109 +--
110 +2.21.0
111 +