Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/crash/
Date: Wed, 24 Aug 2022 14:28:33
Message-Id: 1661351140.70b109caa6aff19373d609c2985feefaaf0a356e.dlan@gentoo
1 commit: 70b109caa6aff19373d609c2985feefaaf0a356e
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 24 14:21:57 2022 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 24 14:25:40 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b109ca
7
8 dev-util/crash: add riscv support
9
10 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
11
12 dev-util/crash/Manifest | 1 +
13 dev-util/crash/crash-8.0.1.ebuild | 14 ++++++++++++--
14 2 files changed, 13 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
17 index 2922247cdb77..7bd03a228de9 100644
18 --- a/dev-util/crash/Manifest
19 +++ b/dev-util/crash/Manifest
20 @@ -1,6 +1,7 @@
21 DIST crash-7.3.1.tar.gz 1329499 BLAKE2B 9c9fd88d7f8874557b99a173b4bd615bb5d41d35b051ee6e82c10a8928b150861dbfdecb3ba94e1367c62c6bb8583c85d39ce7015945d4983d3ce1e1d86dac78 SHA512 018fc33daa144906a29120660951755856169be3df123bcf2bec9c1c4586a18f528c14634f794e658d3dab308419b7a6a7f56b9b0ac5aad68b5ff18ae442f63b
22 DIST crash-8.0.0-patches-1.tar.xz 38880 BLAKE2B b1b22a55f07e7c23c90d13769cdf0db92d3015d5aa5af20bef85394013635bb393c4bbc36fb0af2a925b59b98289e33b3c092ca39c9c90c7213ba5e4b9af8b74 SHA512 17f638c4a5d2cff472a75f58d82d3b7325e6cf9444641c85ec6a3be5b4980aae90ec19dae66ae4b5022f938faae6876b4b50c0b791087fbd20629745b9909ac6
23 DIST crash-8.0.0.tar.gz 1281026 BLAKE2B bb86bc64d04ce136295bf57097674e96d29e5c934b2fc55f2bd5fa331f2d0086929e1fc7ce60b75b4df1ded128e71048e555bffc3321f6f860d00a8fae8bc09e SHA512 c52afab6c8187dc0c44a13b2a5b33bd7df33d9ee12bcecc6b7e94e8bc98d9470c134cb0fbe941b750f36a66028aad718bfd6f1a00524ad38ce43d1f278048a3b
24 +DIST crash-8.0.1-extra-0.tar.xz 19152 BLAKE2B 60e40fa646f19fe1c5c120812f25c9b1ca3ace975decdeda3c4914ee730a15faf374c6400419ec5d2923c6c79a13d4c63b03fbc4410b2bef5b166015560e63e6 SHA512 1797f6200b7ef9c9bd1e3c1efe499f5d9c5fe70213f0adac55a763f3b8675e4eccf04a62223e321c5d23a426e214860205222e78ce6f36c0dab2f7bafc141824
25 DIST crash-8.0.1.tar.gz 1293336 BLAKE2B 97c2e6e9f8407d6f310afb120c9609f845fb4395543634dfca5bf1278aecacb2fb30ead890f72ac476674ffd9df189e26e4261f09c577e0fcaaaacfe120fe6f1 SHA512 ef9fe84dd5efa1b0570f71a8dd7af398a2ff35e9dc9fbcbeafd0f5ff503c7c4da93a33ffddfbac672fe12788dd3712808d6726ba9161ce282a7c76c3e2dc0793
26 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41
27 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
28
29 diff --git a/dev-util/crash/crash-8.0.1.ebuild b/dev-util/crash/crash-8.0.1.ebuild
30 index 7cb2b455d1a8..d3dadfd87731 100644
31 --- a/dev-util/crash/crash-8.0.1.ebuild
32 +++ b/dev-util/crash/crash-8.0.1.ebuild
33 @@ -6,6 +6,8 @@ EAPI=8
34 inherit toolchain-funcs
35
36 GDB_VERSION=10.2
37 +UPSTREAM_VER=
38 +EXTRA_VER=0
39
40 if [[ ${PV} == "9999" ]] ; then
41 EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
42 @@ -14,10 +16,13 @@ if [[ ${PV} == "9999" ]] ; then
43 inherit git-r3
44 else
45 [[ -n ${UPSTREAM_VER} ]] && \
46 - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CAT}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz"
47 + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz"
48 +
49 + [[ -n ${EXTRA_VER} ]] && \
50 + EXTRA_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-extra-${EXTRA_VER}.tar.xz"
51
52 SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
53 - ${UPSTREAM_PATCHSET_URI}
54 + ${UPSTREAM_PATCHSET_URI} ${EXTRA_PATCHSET_URI}
55 mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
56 KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
57 fi
58 @@ -40,6 +45,11 @@ src_prepare() {
59 eapply "${WORKDIR}"/patches-upstream
60 fi
61
62 + if [[ -n ${EXTRA_VER} ]]; then
63 + einfo "Try to apply Crash's Extra patch set"
64 + eapply "${WORKDIR}"/patches-extra
65 + fi
66 +
67 sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
68 ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die
69 }