* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/
@ 2018-07-01 4:11 Matthias Maier
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Maier @ 2018-07-01 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 29741bb4addc99eb6271754698151704cfebbec3
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 04:08:36 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 04:11:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29741bb4
sys-libs/libunwind: fix compilation with musl
Package-Manager: Portage-2.3.41, Repoman-2.3.9
....2.1-only-include-execinfo_h-if-avaliable.patch | 51 ++++++++++++++++++++++
sys-libs/libunwind/libunwind-1.2.1-r1.ebuild | 1 +
2 files changed, 52 insertions(+)
diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch b/sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch
new file mode 100644
index 00000000000..ee11149771c
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.2.1-only-include-execinfo_h-if-avaliable.patch
@@ -0,0 +1,51 @@
+From 0f3f41a86842f2b19aa07af5242cb775ef9b20d3 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sat, 30 Jun 2018 22:44:22 -0500
+Subject: [PATCH] Only include execinfo.h where avaliable
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ tests/test-coredump-unwind.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c
+index 5254708..33f92b0 100644
+--- a/tests/test-coredump-unwind.c
++++ b/tests/test-coredump-unwind.c
+@@ -57,7 +57,9 @@
+ #include <grp.h>
+
+ /* For SIGSEGV handler code */
++#if HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <sys/ucontext.h>
+
+ #include <libunwind-coredump.h>
+@@ -202,7 +204,7 @@ void die_out_of_memory(void)
+ /* End of utility logging functions */
+
+
+-
++#if HAVE_EXECINFO_H
+ static
+ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext)
+ {
+@@ -249,12 +251,14 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext)
+
+ _exit(1);
+ }
+-
++#endif
+ static void install_sigsegv_handler(void)
+ {
+ struct sigaction sa;
+ memset(&sa, 0, sizeof(sa));
++#if HAVE_EXECINFO_H
+ sa.sa_sigaction = handle_sigsegv;
++#endif
+ sa.sa_flags = SA_SIGINFO;
+ sigaction(SIGSEGV, &sa, NULL);
+ sigaction(SIGILL, &sa, NULL);
+--
+2.18.0
diff --git a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
index 8bdde358d13..a4690fc050e 100644
--- a/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${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
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/
@ 2021-12-02 23:56 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-12-02 23:56 UTC (permalink / raw
To: gentoo-commits
commit: c0ddacd19291a5c92245feacc7887921e10a697f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 23:56:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 23:56:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ddacd1
sys-libs/libunwind: drop 1.6.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-libs/libunwind/Manifest | 1 -
...bunwind-1.6.0-avoid-bashisms-in-configure.patch | 21 -----
sys-libs/libunwind/libunwind-1.6.0.ebuild | 100 ---------------------
3 files changed, 122 deletions(-)
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 7634e7a03c51..2cf810467cc0 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,3 +1,2 @@
DIST libunwind-1.5.0.tar.gz 878355 BLAKE2B ee35441289926ac22a58bedb9f831d8e13bacd663a99b3ce25eed229f25f0423bbbd90e09e3d62b003518d7a620aa6d15b0dd5b93632736a89fa0667b35d5fc2 SHA512 1df20ca7a8cee2f2e61294fa9b677e88fec52e9d5a329f88d05c2671c69fa462f6c18808c97ca9ff664ef57292537a844f00b18d142b1938c9da701ca95a4bab
-DIST libunwind-1.6.0.tar.gz 901221 BLAKE2B 360275931399a1cd931e4680f404eff369c9e924d95797d91b61852ab49af2acb2c42ddb9fef72e1e2f39a1bddb6767f7b5f9ba56e27fa581f73db9e3f1168e4 SHA512 89f6355134a3c3175c23fe1a44600d61f15e2533e6816286ad39f799d48f7abdcc03ea354aa1aed859cf277c24e475bc7e625c90b1dc0b69921d03dd1f160464
DIST libunwind-1.6.2.tar.gz 901392 BLAKE2B 3d0313f7e92cbc3e1a84ad3831a5170f21cdf772f1697ca0a59dea63cdd47da382e9f1fd77325d9ff8bcd47559a425dc883a820c646c628cd00faed82cb0f83f SHA512 1d17dfb14f99a894a6cda256caf9ec481c14068aaf8f3a85fa3befa7c7cca7fca0f544a91a3a7c2f2fc55bab19b06a67ca79f55ac9081151d94478c7f611f8f7
diff --git a/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch b/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch
deleted file mode 100644
index 16fd593c3c1a..000000000000
--- a/sys-libs/libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/libunwind/libunwind/pull/315
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,7 +136,7 @@ AC_MSG_RESULT([$enable_ptrace])
-
- AC_ARG_ENABLE(setjmp,
- AS_HELP_STRING([--enable-setjmp],[building libunwind-setjmp library]),,
-- [AS_IF([test x$target_arch == x$host_arch], [enable_setjmp=yes], [enable_setjmp=no])]
-+ [AS_IF([test x$target_arch = x$host_arch], [enable_setjmp=yes], [enable_setjmp=no])]
- )
-
- AC_ARG_ENABLE(documentation,
-@@ -261,7 +261,7 @@ case "${target_arch}" in
- (aarch64) enable_debug_frame=yes;;
- (*) enable_debug_frame=no;;
- esac])
--if test x$remote_only == xyes; then
-+if test x$remote_only = xyes; then
- enable_debug_frame=no
- fi
- if test x$enable_debug_frame = xyes; then
diff --git a/sys-libs/libunwind/libunwind-1.6.0.ebuild b/sys-libs/libunwind/libunwind-1.6.0.ebuild
deleted file mode 100644
index 9a82c45d2b02..000000000000
--- a/sys-libs/libunwind/libunwind-1.6.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2005-2021 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 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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug debug-frame doc libatomic lzma static-libs test zlib"
-
-RESTRICT="test !test? ( test )" # some tests are broken (toolchain version dependent, rely on external binaries)
-
-# We just use the header from libatomic.
-RDEPEND="
- lzma? ( app-arch/xz-utils[static-libs?,${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib[static-libs?,${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )"
-
-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-riscv.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.6.0-avoid-bashisms-in-configure.patch
-)
-
-src_prepare() {
- default
-
- chmod +x src/ia64/mk_cursor_i || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- # --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
- --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 zlib zlibdebuginfo)
- # 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.
- $(use_enable debug conservative_checks)
- $(use_enable debug)
- $(use_enable test tests)
- )
-
- export ac_cv_header_atomic_ops_h=$(usex libatomic)
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-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_all() {
- find "${ED}" -name "*.la" -type f -delete || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/
@ 2021-07-07 9:40 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2021-07-07 9:40 UTC (permalink / raw
To: gentoo-commits
commit: c8d170da873918e7969852ffdd48ff2904f65432
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 7 07:12:49 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jul 7 09:39:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d170da
sys-libs/libunwind: fix ABI_X86=x32 build
Reported-by: Jan Ziak
Closes: https://bugs.gentoo.org/614374
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/libunwind/files/libunwind-1.5.0-x32.patch | 17 +++++++++++++++++
sys-libs/libunwind/libunwind-1.5.0-r1.ebuild | 1 +
2 files changed, 18 insertions(+)
diff --git a/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch b/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch
new file mode 100644
index 00000000000..a3bbc81f45b
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.5.0-x32.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/614374
+
+From: kasperk81 <83082615+kasperk81@users.noreply.github.com>
+Date: Wed, 30 Jun 2021 23:23:22 +0000
+Subject: [PATCH] Fix -mx32 compilation error
+
+--- a/src/x86_64/Gos-linux.c
++++ b/src/x86_64/Gos-linux.c
+@@ -149,7 +149,7 @@ x86_64_sigreturn (unw_cursor_t *cursor)
+ __asm__ __volatile__ ("mov %0, %%rsp;"
+ "mov %1, %%rax;"
+ "syscall"
+- :: "r"(sc), "i"(SYS_rt_sigreturn)
++ :: "r"((uint64_t)sc), "i"(SYS_rt_sigreturn)
+ : "memory");
+ abort();
+ }
diff --git a/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild b/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild
index ae510ed27fe..082fdab6ed8 100644
--- a/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.5.0-r1.ebuild
@@ -49,6 +49,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.2-coredump-regs.patch #586092
"${FILESDIR}"/${PN}-1.2-ia64-ptrace-coredump.patch
"${FILESDIR}"/${PN}-1.2-ia64-missing.patch
+ "${FILESDIR}"/${PN}-1.5.0-x32.patch
# needs refresh:
#"${FILESDIR}"/${PN}-1.2.1-only-include-execinfo_h-if-avaliable.patch
)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/
@ 2018-06-30 22:55 Matthias Maier
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Maier @ 2018-06-30 22:55 UTC (permalink / raw
To: gentoo-commits
commit: fe5905ab50c0c46bd8ebc6ec406a8195eab0dd71
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 22:34:58 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 22:55:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5905ab
sys-libs/libunwind: export correct version number
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --force
.../files/libunwind-1.2.1-fix_version_macros.patch | 13 +++++++++++++
.../{libunwind-1.2.1.ebuild => libunwind-1.2.1-r1.ebuild} | 6 ++++--
2 files changed, 17 insertions(+), 2 deletions(-)
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
new file mode 100644
index 00000000000..63202937084
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index a254bbe..fe0247b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,6 @@
+ define(pkg_major, 1)
+-define(pkg_minor, 2.1)
+-define(pkg_extra, )
++define(pkg_minor, 2)
++define(pkg_extra, 1)
+ define(pkg_maintainer, libunwind-devel@nongnu.org)
+ define(mkvers, $1.$2$3)
+ dnl Process this file with autoconf to produce a configure script.
diff --git a/sys-libs/libunwind/libunwind-1.2.1.ebuild b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
similarity index 94%
rename from sys-libs/libunwind/libunwind-1.2.1.ebuild
rename to sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
index b03e4212353..8bdde358d13 100644
--- a/sys-libs/libunwind/libunwind-1.2.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 eutils libtool multilib-minimal
+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"
@@ -47,6 +47,7 @@ PATCHES=(
"${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
)
src_prepare() {
@@ -57,6 +58,7 @@ src_prepare() {
sed -i -e '/^SUBDIRS/s:tests::' Makefile.in || die
elibtoolize
+ eautoreconf
}
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-02 23:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-01 4:11 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2021-12-02 23:56 Sam James
2021-07-07 9:40 Sergei Trofimovich
2018-06-30 22:55 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox