Gentoo Archives: gentoo-commits

From: Matthias Maier <tamiko@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/
Date: Sat, 30 Jun 2018 22:56:04
Message-Id: 1530399345.fe5905ab50c0c46bd8ebc6ec406a8195eab0dd71.tamiko@gentoo
1 commit: fe5905ab50c0c46bd8ebc6ec406a8195eab0dd71
2 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 30 22:34:58 2018 +0000
4 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 30 22:55:45 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5905ab
7
8 sys-libs/libunwind: export correct version number
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11 RepoMan-Options: --force
12
13 .../files/libunwind-1.2.1-fix_version_macros.patch | 13 +++++++++++++
14 .../{libunwind-1.2.1.ebuild => libunwind-1.2.1-r1.ebuild} | 6 ++++--
15 2 files changed, 17 insertions(+), 2 deletions(-)
16
17 diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
18 new file mode 100644
19 index 00000000000..63202937084
20 --- /dev/null
21 +++ b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
22 @@ -0,0 +1,13 @@
23 +diff --git a/configure.ac b/configure.ac
24 +index a254bbe..fe0247b 100644
25 +--- a/configure.ac
26 ++++ b/configure.ac
27 +@@ -1,6 +1,6 @@
28 + define(pkg_major, 1)
29 +-define(pkg_minor, 2.1)
30 +-define(pkg_extra, )
31 ++define(pkg_minor, 2)
32 ++define(pkg_extra, 1)
33 + define(pkg_maintainer, libunwind-devel@××××××.org)
34 + define(mkvers, $1.$2$3)
35 + dnl Process this file with autoconf to produce a configure script.
36
37 diff --git a/sys-libs/libunwind/libunwind-1.2.1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
38 similarity index 94%
39 rename from sys-libs/libunwind/libunwind-1.2.1.ebuild
40 rename to sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
41 index b03e4212353..8bdde358d13 100644
42 --- a/sys-libs/libunwind/libunwind-1.2.1.ebuild
43 +++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
44 @@ -1,11 +1,11 @@
45 -# Copyright 1999-2017 Gentoo Foundation
46 +# Copyright 1999-2018 Gentoo Foundation
47 # Distributed under the terms of the GNU General Public License v2
48
49 EAPI=6
50
51 MY_PV=${PV/_/-}
52 MY_P=${PN}-${MY_PV}
53 -inherit eutils libtool multilib-minimal
54 +inherit autotools eutils libtool multilib-minimal
55
56 DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
57 HOMEPAGE="https://savannah.nongnu.org/projects/libunwind"
58 @@ -47,6 +47,7 @@ PATCHES=(
59 "${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch
60 "${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
61 "${FILESDIR}"/${PN}-1.2-ia64-missing.patch
62 + "${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch
63 )
64
65 src_prepare() {
66 @@ -57,6 +58,7 @@ src_prepare() {
67 sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
68
69 elibtoolize
70 + eautoreconf
71 }
72
73 multilib_src_configure() {