[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/

2024-01-20 Thread Conrad Kostecki 
commit: a20318e93bb3e42a11c173e7de61e33f98f036c3
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Jan 20 08:21:14 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jan 20 21:21:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20318e9

sys-libs/libunwind: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../libunwind-1.8.0_rc1-configure-bashism.patch | 21 -
 1 file changed, 21 deletions(-)

diff --git 
a/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch 
b/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch
deleted file mode 100644
index b4e36d71efdc..
--- a/sys-libs/libunwind/files/libunwind-1.8.0_rc1-configure-bashism.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/libunwind/libunwind/pull/675
-
-From ac81d339a7999e054deda2c0041c01424df3eadd Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sat, 2 Dec 2023 21:18:44 +
-Subject: [PATCH] configure.ac: fix bashism in LDFLAGS append
-
-'+=' is not required for POSIX shells and may not work with e.g. /bin/sh
-provided by dash. Just expand it instead.
 a/configure.ac
-+++ b/configure.ac
-@@ -54,7 +54,7 @@ dnl Checks for libraries.
- AC_MSG_NOTICE([--- Checking for libraries ---])
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
--LDFLAGS+=" -nostdlib"
-+LDFLAGS="${LDFLAGS} -nostdlib"
- AC_SEARCH_LIBS([_Unwind_Resume], [gcc_s gcc],
-[AS_IF([test "$ac_cv_search__Unwind_Resume" != "none 
required"],
-   [AC_SUBST([LIBCRTS], 
["$ac_cv_search__Unwind_Resume"])])],
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/

2021-12-02 Thread Sam James 
commit: c0ddacd19291a5c92245feacc7887921e10a697f
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 23:56:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 23:56:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ddacd1

sys-libs/libunwind: drop 1.6.0

Signed-off-by: Sam James  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..
--- 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..
--- 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,

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/

2021-11-27 Thread Sam James 
commit: c445899f326a6aa0c824973e329d9ba8a0324303
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 27 16:46:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 27 16:46:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c445899f

sys-libs/libunwind: add link to upstream PR fo bashism patch

Signed-off-by: Sam James  gentoo.org>

 .../libunwind/files/libunwind-1.6.0-avoid-bashisms-in-configure.patch  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
index 79ac58d1e539..16fd593c3c1a 100644
--- 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
@@ -1,5 +1,4 @@
-diff --git a/configure.ac b/configure.ac
-index 0bd2234..42cca58 100644
+https://github.com/libunwind/libunwind/pull/315
 --- a/configure.ac
 +++ b/configure.ac
 @@ -136,7 +136,7 @@ AC_MSG_RESULT([$enable_ptrace])

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/

2021-07-07 Thread Sergei Trofimovich 
commit: c8d170da873918e7969852ffdd48ff2904f65432
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jul  7 07:12:49 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jul  7 09:39:54 2021 +
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  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 000..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+kasper...@users.noreply.github.com>
+Date: Wed, 30 Jun 2021 23:23:22 +
+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
 )

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/

2020-07-06 Thread Sergei Trofimovich 
commit: 9a837fb82b78ecbbc91dbb1b629e6967f28b2368
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jul  6 17:26:25 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 18:40:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a837fb8

sys-libs/libunwind: remove unused patches

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16615
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/libunwind-1.2-ia64-undwarf.patch | 17 
 .../files/libunwind-1.2.1-arm-__asm__.patch| 47 --
 .../files/libunwind-1.2.1-fix_version_macros.patch | 13 --
 .../files/libunwind-1.2.1-no-PROTECTED.patch   | 14 ---
 4 files changed, 91 deletions(-)

diff --git a/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch 
b/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch
deleted file mode 100644
index 1e3e2489828..000
--- a/sys-libs/libunwind/files/libunwind-1.2-ia64-undwarf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/mi/Gget_proc_name.c b/src/mi/Gget_proc_name.c
-index 5376f82..64d2503 100644
 a/src/mi/Gget_proc_name.c
-+++ b/src/mi/Gget_proc_name.c
-@@ -106,8 +106,12 @@ unw_get_proc_name (unw_cursor_t *cursor, char *buf, 
size_t buf_len,
-   ip = tdep_get_ip (c);
-+#if !defined(__ia64)
-   if (c->dwarf.use_prev_instr)
- --ip;
-+#endif
-   error = get_proc_name (tdep_get_as (c), ip, buf, buf_len, offp,
-  tdep_get_as_arg (c));
-+#if !defined(__ia64)
-   if (c->dwarf.use_prev_instr && offp != NULL && error == 0)
- *offp += 1;
-+#endif
-   return error;

diff --git a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch 
b/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
deleted file mode 100644
index 4b6debabefc..000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-arm-__asm__.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/635674
-
-From ca6b6f3ad9190814ef7869e8c7e73dae0922f647 Mon Sep 17 00:00:00 2001
-From: Romain Naour 
-Date: Mon, 3 Jul 2017 15:31:10 +0200
-Subject: [PATCH] libunwind-arm: fix build failure due to asm()
-
-mesa3d on ARM build with libunwind support enabled fail to build due to asm()
-function used when building with -std=c99.
-The gcc documentation [1] suggest to use __asm__ instead of asm.
-
-Fixes:
-https://urldefense.proofpoint.com/v2/url?u=http-3A__autobuild.buildroot.net_results_3ef_3efe156b6494e4392b6c31de447ee2c72acc1a53&d=DwICAg&c=5VD0RTtNlTh3ycd41b3MUw&r=vou6lT5jmE_fWQWZZgNrsMWu4RT87QAB9V07tPHlP5U&m=BlAszRQ0vewy5vW7raCh9FmNOACKez_juz55zoiNfUs&s=4sXL6_rFriQz7qi5ygKXBIVHMc7YSdCBnkkHoi347CU&e=
-
-[1] 
https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
-
-Signed-off-by: Romain Naour 
-Cc: Bernd Kuhls 

- include/libunwind-arm.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
-index f208487a..1c856faf 100644
 a/include/libunwind-arm.h
-+++ b/include/libunwind-arm.h
-@@ -265,7 +265,7 @@ unw_tdep_context_t;
- #ifndef __thumb__
- #define unw_tdep_getcontext(uc) (({ \
-   unw_tdep_context_t *unw_ctx = (uc);   \
--  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;  \
-+  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;  \
-   __asm__ __volatile__ (\
- "stmia %[base], {r0-r15}"   \
- : : [base] "r" (unw_base) : "memory");  \
-@@ -273,7 +273,7 @@ unw_tdep_context_t;
- #else /* __thumb__ */
- #define unw_tdep_getcontext(uc) (({ \
-   unw_tdep_context_t *unw_ctx = (uc);   \
--  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;  \
-+  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;  \
-   __asm__ __volatile__ (\
- ".align 2\nbx pc\nnop\n.code 32\n"  \
- "stmia %[base], {r0-r15}\n" \
--- 
-2.18.0
-

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
deleted file mode 100644
index 63202937084..000
--- a/sys-libs/libunwind/files/libunwind-1.2.1-fix_version_macros.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-de...@nongnu.org)
- define(mkvers, $1.$2$3)
- dnl Pro

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/

2019-12-12 Thread Aaron Bauman 
commit: 51bed4fe21ed5f166206ac7ab51fd937ed75d42c
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Dec 12 20:48:03 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Dec 12 20:52:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51bed4fe

sys-libs/libunwind: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13959
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/libunwind-1.1-fix-CVE-2015-3239.patch| 15 --
 sys-libs/libunwind/files/libunwind-1.1-lzma.patch  | 63 --
 2 files changed, 78 deletions(-)

diff --git a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch 
b/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
deleted file mode 100644
index 153108bbb15..000
--- a/sys-libs/libunwind/files/libunwind-1.1-fix-CVE-2015-3239.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-taken from Fedora
-
-https://bugs.gentoo.org/585830
-
 libunwind-1.1/include/dwarf_i.h.CVE20153239
-+++ libunwind-1.1/include/dwarf_i.h
-@@ -20,7 +20,7 @@
- extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
- /* REG is evaluated multiple times; it better be side-effects free!  */
- # define dwarf_to_unw_regnum(reg)   \
--  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
-+  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
- #endif
- 
- #ifdef UNW_LOCAL_ONLY

diff --git a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch 
b/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
deleted file mode 100644
index 09cefa02853..000
--- a/sys-libs/libunwind/files/libunwind-1.1-lzma.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sat, 15 Feb 2014 21:00:59 -0500
-Subject: [PATCH] link sublibs against liblzma as needed
-
-The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
-it.  This produces sub-shared libs that don't link against lzma and can
-make the linker angry due to underlinking like so:
-
-libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
-   -frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
-   -Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
-   -o .libs/test-coredump-unwind test-coredump-unwind.o  \
-   ../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
-../src/.libs/libunwind-coredump.so: error: undefined reference to 
'lzma_stream_footer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 
'lzma_index_buffer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 
'lzma_index_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 
'lzma_index_end'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 
'lzma_index_uncompressed_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 
'lzma_stream_buffer_decode'
-collect2: error: ld returned 1 exit status
-
-So add LIBLZMA to the right LIBADD for each of these libraries.
-
-URL: https://bugs.gentoo.org/444050
-Signed-off-by: Mike Frysinger 

- src/Makefile.am | 4 
- 1 file changed, 4 insertions(+)
-
 a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC 
$(AM_LIBTOOLFLAGS) \
-   $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-   $(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
- @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
--libunwind_coredump_la_LIBADD =
-+libunwind_coredump_la_LIBADD = $(LIBLZMA)
- am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
-   coredump/_UCD_create.c coredump/_UCD_destroy.c \
-   coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
-@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo 
dwarf/Lfde.lo \
- libunwind_dwarf_local_la_OBJECTS =  \
-   $(am_libunwind_dwarf_local_la_OBJECTS)
- @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
--libunwind_elf32_la_LIBADD =
-+libunwind_elf32_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf32_la_OBJECTS = elf32.lo
- libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
- @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
--libunwind_elf64_la_LIBADD =
-+libunwind_elf64_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf64_la_OBJECTS = elf64.lo
- libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
- @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
--libunwind_elfxx_la_LIBADD =
-+libunwind_elfxx_la_LIBADD = $(LIBLZMA)
- am_libunwind_elfxx_la_OBJECTS = elfxx.lo
- libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
- @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
--- 
-1.8.5.5
-

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/

2018-06-30 Thread Matthias Maier 
commit: 29741bb4addc99eb6271754698151704cfebbec3
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jul  1 04:08:36 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jul  1 04:11:31 2018 +
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 000..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" 
+Date: Sat, 30 Jun 2018 22:44:22 -0500
+Subject: [PATCH] Only include execinfo.h where avaliable
+
+Signed-off-by: Jory A. Pratt 
+---
+ 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 
+ 
+ /* For SIGSEGV handler code */
++#if HAVE_EXECINFO_H
+ #include 
++#endif
+ #include 
+ 
+ #include 
+@@ -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() {

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/, sys-libs/libunwind/

2018-06-30 Thread Matthias Maier 
commit: fe5905ab50c0c46bd8ebc6ec406a8195eab0dd71
Author: Matthias Maier  gentoo  org>
AuthorDate: Sat Jun 30 22:34:58 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sat Jun 30 22:55:45 2018 +
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 000..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-de...@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() {

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libunwind/files/

2017-01-14 Thread Aaron Bauman 
commit: 7b772e5232475dd2f931edd8f93a88e3769e044f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Jan 15 07:27:10 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jan 15 07:27:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b772e52

sys-libs/libunwind: remove stale patches

Package-Manager: portage-2.3.0

 .../files/libunwind-0.99-disable-setjmp.patch  | 213 -
 .../libunwind-0.99-implicit-declaration.patch  |  17 --
 .../files/libunwind-1.0.1-disable-setjmp.patch |  37 
 .../libunwind/files/libunwind-1.0.1-ia64.patch | 133 -
 4 files changed, 400 deletions(-)

diff --git a/sys-libs/libunwind/files/libunwind-0.99-disable-setjmp.patch 
b/sys-libs/libunwind/files/libunwind-0.99-disable-setjmp.patch
deleted file mode 100644
index 698d2ac..
--- a/sys-libs/libunwind/files/libunwind-0.99-disable-setjmp.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/libunwind/devel/libunwind-disable-setjmp.patch?revision=1.1&view=markup
-http://bugs.gentoo.org/show_bug.cgi?id=299344
-
-At least x86_64 version cannot work, src/setjmp/setjmp.c and
-src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
-match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
-
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,7 +12,7 @@ lib_LTLIBRARIES_cdep_setjmp  =
- else
- LIBRARIES_cdep= libunwind-ptrace.a
- lib_LTLIBRARIES_cdep  = libunwind.la
--lib_LTLIBRARIES_cdep_setjmp   = libunwind-setjmp.la
-+lib_LTLIBRARIES_cdep_setjmp   = #libunwind-setjmp.la
- endif
- 
- ### libunwind-ptrace:
-@@ -27,21 +27,21 @@ libunwind_ptrace_a_SOURCES =   
  \
-   ptrace/_UPT_reg_offset.c ptrace/_UPT_resume.c
- 
- ### libunwind-setjmp:
--libunwind_setjmp_la_LDFLAGS   = $(COMMON_SO_LDFLAGS)   \
---version-info $(SETJMP_SO_VERSION)
--libunwind_setjmp_la_LIBADD= libunwind-$(arch).la -lc
--libunwind_setjmp_la_SOURCES_common= setjmp/setjmp_i.h \
--setjmp/longjmp.c  \
--setjmp/siglongjmp.c
--libunwind_setjmp_la_SOURCES_arm   = arm/siglongjmp.S
--libunwind_setjmp_la_SOURCES_ia64  = ia64/setjmp.S  ia64/sigsetjmp.S  \
--ia64/longjmp.S ia64/siglongjmp.S
--libunwind_setjmp_la_SOURCES_hppa  = hppa/siglongjmp.S
--libunwind_setjmp_la_SOURCES_mips  = mips/siglongjmp.S
--libunwind_setjmp_la_SOURCES_x86   = x86/longjmp.S x86/siglongjmp.S
--libunwind_setjmp_la_SOURCES_x86_64= x86_64/longjmp.S x86_64/siglongjmp.S
--libunwind_setjmp_la_SOURCES_ppc64   = ppc/longjmp.S ppc/siglongjmp.S
--libunwind_setjmp_la_SOURCES_ppc32   = ppc/longjmp.S ppc/siglongjmp.S
-+#libunwind_setjmp_la_LDFLAGS  = $(COMMON_SO_LDFLAGS)   \
-+#   -version-info $(SETJMP_SO_VERSION)
-+#libunwind_setjmp_la_LIBADD   = libunwind-$(arch).la -lc
-+#libunwind_setjmp_la_SOURCES_common   = setjmp/setjmp_i.h \
-+#   setjmp/longjmp.c  \
-+#   setjmp/siglongjmp.c
-+#libunwind_setjmp_la_SOURCES_arm  = arm/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_ia64 = ia64/setjmp.S  ia64/sigsetjmp.S  \
-+#   ia64/longjmp.S ia64/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_hppa = hppa/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_mips = mips/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_x86  = x86/longjmp.S x86/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_x86_64   = x86_64/longjmp.S x86_64/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_ppc64   = ppc/longjmp.S ppc/siglongjmp.S
-+#libunwind_setjmp_la_SOURCES_ppc32   = ppc/longjmp.S ppc/siglongjmp.S
- 
- ### libunwind:
- 
-@@ -359,8 +359,8 @@ if ARCH_ARM
- if !REMOTE_ONLY
-  libunwind_arm_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES  = $(libunwind_setjmp_la_SOURCES_common) \
--$(libunwind_setjmp_la_SOURCES_arm)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+#   $(libunwind_setjmp_la_SOURCES_arm)
- else
- if ARCH_IA64
-  ia64_mk_Gcursor_i_SOURCES = ia64/mk_Gcursor_i.c
-@@ -378,8 +378,8 @@ Lcursor_i.h: ia64/mk_Lcursor_i
- if !REMOTE_ONLY
-  libunwind_ia64_la_LIBADD = libunwind.la -lc
- endif
-- libunwind_setjmp_la_SOURCES  = $(libunwind_setjmp_la_SOURCES_common) \
--$(libunwind_setjmp_la_SOURCES_ia64)
-+# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \
-+#   $(libunwind_setjmp_la_SOURCES_ia64)
- else
- if ARCH_HPPA
-  lib_LTLIBRARIES_arch = libunwind-hppa.la
-@@ -389,8 +389,8 @@ if ARCH_HPPA