Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 588618 Details for
Bug 693250
sys-libs/libunwind: Fix SLOT, unconditionally drop *.la files
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
libunwind.patch (text/plain), 12.44 KB, created by
Arfrever Frehtes Taifersar Arahesis
on 2019-09-01 05:07:39 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Arfrever Frehtes Taifersar Arahesis
Created:
2019-09-01 05:07:39 UTC
Size:
12.44 KB
patch
obsolete
>From 5c13bd9e1294df5bf14125730209075f2df41d80 Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Sun, 1 Sep 2019 04:27:54 +0000 >Subject: [PATCH 1/3] sys-libs/libunwind: Delete old version (1.2.1-r2). > >Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >--- > sys-libs/libunwind/libunwind-1.2.1-r2.ebuild | 105 ------------------- > 1 file changed, 105 deletions(-) > delete mode 100644 sys-libs/libunwind/libunwind-1.2.1-r2.ebuild > >diff --git a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild >deleted file mode 100644 >index 8842f71d786..00000000000 >--- a/sys-libs/libunwind/libunwind-1.2.1-r2.ebuild >+++ /dev/null >@@ -1,105 +0,0 @@ >-# Copyright 1999-2018 Gentoo Foundation >-# Distributed under the terms of the GNU General Public License v2 >- >-EAPI=6 >- >-MY_PV=${PV/_/-} >-MY_P=${PN}-${MY_PV} >-inherit autotools eutils libtool multilib-minimal >- >-DESCRIPTION="Portable and efficient API to determine the call-chain of a program" >-HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" >-SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" >- >-LICENSE="MIT" >-SLOT="7" >-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" >-IUSE="debug debug-frame doc libatomic lzma +static-libs" >- >-RESTRICT="test" # half of tests are broken (toolchain version dependent) >- >-# We just use the header from libatomic. >-RDEPEND="lzma? ( app-arch/xz-utils )" >-DEPEND="${RDEPEND} >- libatomic? ( dev-libs/libatomic_ops )" >- >-S="${WORKDIR}/${MY_P}" >- >-MULTILIB_WRAPPED_HEADERS=( >- /usr/include/libunwind.h >- >- # see libunwind.h for the full list of arch-specific headers >- /usr/include/libunwind-aarch64.h >- /usr/include/libunwind-arm.h >- /usr/include/libunwind-hppa.h >- /usr/include/libunwind-ia64.h >- /usr/include/libunwind-mips.h >- /usr/include/libunwind-ppc32.h >- /usr/include/libunwind-ppc64.h >- /usr/include/libunwind-sh.h >- /usr/include/libunwind-tilegx.h >- /usr/include/libunwind-x86.h >- /usr/include/libunwind-x86_64.h >-) >- >-PATCHES=( >- "${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092 >- "${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch >- "${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch >- "${FILESDIR}"/${PN}-1.2-ia64-missing.patch >- "${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch >- "${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch >- "${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732 >- "${FILESDIR}"/${PN}-1.2.1-arm-__asm__.patch #635674 >-) >- >-src_prepare() { >- default >- chmod +x src/ia64/mk_cursor_i || die >- # Since we have tests disabled via RESTRICT, disable building in the subdir >- # entirely. This worksaround some build errors too. #484846 >- sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die >- >- elibtoolize >- eautoreconf >-} >- >-multilib_src_configure() { >- # --enable-cxx-exceptions: always enable it, headers provide the interface >- # and on some archs it is disabled by default causing a mismatch between the >- # API and the ABI, bug #418253 >- # conservative-checks: validate memory addresses before use; as of 1.0.1, >- # only x86_64 supports this, yet may be useful for debugging, couple it with >- # debug useflag. >- ECONF_SOURCE="${S}" \ >- ac_cv_header_atomic_ops_h=$(usex libatomic) \ >- econf \ >- --enable-cxx-exceptions \ >- --enable-coredump \ >- --enable-ptrace \ >- --enable-setjmp \ >- $(use_enable debug-frame) \ >- $(use_enable doc documentation) \ >- $(use_enable lzma minidebuginfo) \ >- $(use_enable static-libs static) \ >- $(use_enable debug conservative_checks) \ >- $(use_enable debug) >-} >- >-multilib_src_compile() { >- # Bug 586208 >- CCACHE_NODIRECT=1 default >-} >- >-multilib_src_test() { >- # Explicitly allow parallel build of tests. >- # Sandbox causes some tests to freak out. >- SANDBOX_ON=0 emake check >-} >- >-multilib_src_install() { >- default >- # libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without >- # shared library, so we keep it in any case >- use static-libs || find "${ED}"usr '(' -name 'libunwind-generic.a' -o -name 'libunwind*.la' ')' -delete >-} >-- >2.23.0 > > >From 96724fa52b2873a3e49aec8827caa7d58373ba61 Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Sun, 1 Sep 2019 04:40:51 +0000 >Subject: [PATCH 2/3] sys-libs/libunwind: Fix SLOT. > >This package is not multi-slotted and version in soname of main library is "8", >so SLOT="0/8" is correct. >Block old versions with incorrect SLOT="7". >(slotmove not used due to bugs in package managers (e.g. bug #692776).) > >Closes: https://bugs.gentoo.org/693250 >Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >--- > sys-libs/libunwind/libunwind-1.1-r1.ebuild | 6 ++++-- > sys-libs/libunwind/libunwind-1.2.1-r1.ebuild | 8 +++++--- > sys-libs/libunwind/libunwind-1.2.1-r3.ebuild | 8 +++++--- > 3 files changed, 14 insertions(+), 8 deletions(-) > >diff --git a/sys-libs/libunwind/libunwind-1.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.1-r1.ebuild >index 230f072ca58..4c075b6214f 100644 >--- a/sys-libs/libunwind/libunwind-1.1-r1.ebuild >+++ b/sys-libs/libunwind/libunwind-1.1-r1.ebuild >@@ -1,4 +1,4 @@ >-# Copyright 1999-2018 Gentoo Foundation >+# Copyright 2005-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > EAPI="5" >@@ -10,7 +10,7 @@ HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" > SRC_URI="mirror://nongnu/libunwind/${P}.tar.gz" > > LICENSE="MIT" >-SLOT="7" >+SLOT="0/8" > KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" > IUSE="debug debug-frame libatomic lzma +static-libs" > >@@ -20,6 +20,8 @@ RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this i > RDEPEND="lzma? ( app-arch/xz-utils )" > DEPEND="${RDEPEND} > libatomic? ( dev-libs/libatomic_ops )" >+RDEPEND+=" >+ !${CATEGORY}/${PN}:7" > > DOCS=( AUTHORS ChangeLog NEWS README TODO ) > >diff --git a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild >index 064296cc115..b666591dae3 100644 >--- a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild >+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild >@@ -1,18 +1,18 @@ >-# Copyright 1999-2018 Gentoo Foundation >+# Copyright 2005-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > EAPI=6 > > MY_PV=${PV/_/-} > MY_P=${PN}-${MY_PV} >-inherit autotools eutils libtool multilib-minimal >+inherit autotools libtool multilib-minimal > > DESCRIPTION="Portable and efficient API to determine the call-chain of a program" > HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" > SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" > > LICENSE="MIT" >-SLOT="7" >+SLOT="0/8" > KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 -sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" > IUSE="debug debug-frame doc libatomic lzma +static-libs" > >@@ -22,6 +22,8 @@ RESTRICT="test" # half of tests are broken (toolchain version dependent) > RDEPEND="lzma? ( app-arch/xz-utils )" > DEPEND="${RDEPEND} > libatomic? ( dev-libs/libatomic_ops )" >+RDEPEND+=" >+ !${CATEGORY}/${PN}:7" > > S="${WORKDIR}/${MY_P}" > >diff --git a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild >index 518da3a72e5..084b3b1c272 100644 >--- a/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild >+++ b/sys-libs/libunwind/libunwind-1.2.1-r3.ebuild >@@ -1,18 +1,18 @@ >-# Copyright 1999-2019 Gentoo Authors >+# Copyright 2005-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > EAPI=6 > > MY_PV=${PV/_/-} > MY_P=${PN}-${MY_PV} >-inherit autotools eutils libtool multilib-minimal >+inherit autotools libtool multilib-minimal > > DESCRIPTION="Portable and efficient API to determine the call-chain of a program" > HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" > SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" > > LICENSE="MIT" >-SLOT="7" >+SLOT="0/8" > KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" > IUSE="debug debug-frame doc libatomic lzma +static-libs" > >@@ -22,6 +22,8 @@ RESTRICT="test" # half of tests are broken (toolchain version dependent) > RDEPEND="lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )" > DEPEND="${RDEPEND} > libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )" >+RDEPEND+=" >+ !${CATEGORY}/${PN}:7" > > S="${WORKDIR}/${MY_P}" > >-- >2.23.0 > > >From 18ea983fab9ee2fe7b252dea13a57e27bbecd4e0 Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Sun, 1 Sep 2019 05:02:38 +0000 >Subject: [PATCH 3/3] sys-libs/libunwind: Unconditionally drop *.la files. > >*.pc files are installed. > >Closes: https://bugs.gentoo.org/693250 >Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >--- > sys-libs/libunwind/libunwind-1.2.1-r4.ebuild | 114 +++++++++++++++++++ > 1 file changed, 114 insertions(+) > create mode 100644 sys-libs/libunwind/libunwind-1.2.1-r4.ebuild > >diff --git a/sys-libs/libunwind/libunwind-1.2.1-r4.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r4.ebuild >new file mode 100644 >index 00000000000..243773f322c >--- /dev/null >+++ b/sys-libs/libunwind/libunwind-1.2.1-r4.ebuild >@@ -0,0 +1,114 @@ >+# Copyright 2005-2019 Gentoo Authors >+# Distributed under the terms of the GNU General Public License v2 >+ >+EAPI="7" >+ >+MY_PV=${PV/_/-} >+MY_P=${PN}-${MY_PV} >+ >+inherit autotools libtool multilib-minimal >+ >+DESCRIPTION="Portable and efficient API to determine the call-chain of a program" >+HOMEPAGE="https://savannah.nongnu.org/projects/libunwind" >+SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz" >+ >+LICENSE="MIT" >+SLOT="0/8" >+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" >+IUSE="debug debug-frame doc libatomic lzma +static-libs" >+ >+RESTRICT="test" # half of tests are broken (toolchain version dependent) >+ >+# We just use the header from libatomic. >+RDEPEND="lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )" >+DEPEND="${RDEPEND} >+ libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )" >+RDEPEND+=" >+ !${CATEGORY}/${PN}:7" >+ >+S="${WORKDIR}/${MY_P}" >+ >+MULTILIB_WRAPPED_HEADERS=( >+ /usr/include/libunwind.h >+ >+ # see libunwind.h for the full list of arch-specific headers >+ /usr/include/libunwind-aarch64.h >+ /usr/include/libunwind-arm.h >+ /usr/include/libunwind-hppa.h >+ /usr/include/libunwind-ia64.h >+ /usr/include/libunwind-mips.h >+ /usr/include/libunwind-ppc32.h >+ /usr/include/libunwind-ppc64.h >+ /usr/include/libunwind-sh.h >+ /usr/include/libunwind-tilegx.h >+ /usr/include/libunwind-x86.h >+ /usr/include/libunwind-x86_64.h >+) >+ >+PATCHES=( >+ "${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092 >+ "${FILESDIR}"/${PN}-1.2-ia64-undwarf.patch >+ "${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch >+ "${FILESDIR}"/${PN}-1.2-ia64-missing.patch >+ "${FILESDIR}"/${PN}-1.2.1-fix_version_macros.patch >+ "${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch >+ "${FILESDIR}"/${PN}-1.2.1-no-PROTECTED.patch #659732 >+ "${FILESDIR}"/${PN}-1.2.1-arm-__asm__.patch #635674 >+) >+ >+src_prepare() { >+ default >+ chmod +x src/ia64/mk_cursor_i || die >+ # Since we have tests disabled via RESTRICT, disable building in the subdir >+ # entirely. This worksaround some build errors too. #484846 >+ sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die >+ >+ elibtoolize >+ eautoreconf >+} >+ >+multilib_src_configure() { >+ # --enable-cxx-exceptions: always enable it, headers provide the interface >+ # and on some archs it is disabled by default causing a mismatch between the >+ # API and the ABI, bug #418253 >+ # conservative-checks: validate memory addresses before use; as of 1.0.1, >+ # only x86_64 supports this, yet may be useful for debugging, couple it with >+ # debug useflag. >+ ECONF_SOURCE="${S}" \ >+ ac_cv_header_atomic_ops_h=$(usex libatomic) \ >+ econf \ >+ --enable-cxx-exceptions \ >+ --enable-coredump \ >+ --enable-ptrace \ >+ --enable-setjmp \ >+ $(use_enable debug-frame) \ >+ $(use_enable doc documentation) \ >+ $(use_enable lzma minidebuginfo) \ >+ $(use_enable static-libs static) \ >+ $(use_enable debug conservative_checks) \ >+ $(use_enable debug) >+} >+ >+multilib_src_compile() { >+ # Bug 586208 >+ CCACHE_NODIRECT=1 default >+} >+ >+multilib_src_test() { >+ # Explicitly allow parallel build of tests. >+ # Sandbox causes some tests to freak out. >+ SANDBOX_ON=0 emake check >+} >+ >+multilib_src_install() { >+ default >+ >+ if ! use static-libs; then >+ # Obsolete after http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=commitdiff;h=4e8b7a595e144e905fd9c8aed053d7529afb78a4 >+ rm "${ED}/usr/$(get_libdir)/libunwind-generic.a" || die >+ fi >+} >+ >+multilib_src_install_all() { >+ find "${D}" -name "*.la" -type f -delete || die >+} >-- >2.23.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 693250
:
588618
|
588680
|
628622
|
628624