[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/, dev-libs/elfutils/files/, dev-libs/elfutils/

[Sam James]

commit: ef17e2c45cd32e31ec8c696702bb7baf6707f9ef
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 14 07:56:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 14 07:57:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef17e2c4

dev-libs/elfutils: use patches from devspace; update for musl in 0.186

- Move 0.185 and 0.186 patches into their own compressed tarball in devspace
  (files dir was getting _way_ too big)

- Fix patches for musl in 0.186 (both one which didn't apply anymore and
  an additional upstream patch).

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

 dev-libs/elfutils/Manifest |   2 +
 dev-libs/elfutils/elfutils-0.185.ebuild|  11 +-
 dev-libs/elfutils/elfutils-0.186.ebuild|  14 +-
 ...lfutils-0.175-disable-biarch-test-PR24158.patch |   9 --
 .../files/elfutils-0.177-disable-large.patch   |  14 --
 .../files/elfutils-0.180-PaX-support.patch |  26 
 ac-rework-gnu99-ext-check-to-allow-clang.patch | 146 -
 .../elfutils-0.185-glibc-2.34-test-failure.patch   | 124 -
 ...utils-0.185-pull-advance_pc-in-file-scope.patch |  70 --
 .../files/elfutils-0.185-static-inline.patch   |  12 --
 .../files/musl/elfutils-0.185-aarch64-regs.patch   |  57 
 .../elfutils/files/musl/elfutils-0.185-cdefs.patch |  20 ---
 .../files/musl/elfutils-0.185-error-h.patch|  68 --
 .../files/musl/elfutils-0.185-macros.patch |  86 
 .../files/musl/elfutils-0.185-strndupa.patch   |  22 
 15 files changed, 8 insertions(+), 673 deletions(-)

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0a6a8004f327..6af4e92e7b9e 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,2 +1,4 @@
+DIST elfutils-0.185-patches.tar.gz 7625 BLAKE2B 
92aff147aa7e45976863e8129e25ecad74ad9bca231c9223897094c5933c3b350eb525a203b492d80c1eabee3b3808b43e30bdb879d7173eac968afa2005e97c
 SHA512 
3f253c4de97190731ac157044572912b76df80f9473f3df335f0383dad6409f987593a749c5284672cf1b20241ac3ed9d77b126f730aaf594725703b6a426906
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 
57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af
 SHA512 
34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
+DIST elfutils-0.186-patches.tar.gz 3323 BLAKE2B 
360365597d3a08d6f4fe843d04bcddd07a44ca93dae2034615abc450517e1be21c81a55aa379c409902e134ae795b38bb7461c65cdba3934ac7ef1e4e0e53091
 SHA512 
e2d427be505fdc416751a1fbc3bb4f39577859d94ce43990faa83c135fe36be2ddb3a2ef0f1020cfa37060e6d43dc7b8cf3db0d07d62b31bf29cb9a4a5945ce1
 DIST elfutils-0.186.tar.bz2 9230491 BLAKE2B 
49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9
 SHA512 
c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78

diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild 
b/dev-libs/elfutils/elfutils-0.185.ebuild
index 84df482f3f86..26aeca00e2e8 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -8,6 +8,7 @@ inherit flag-o-matic multilib-minimal
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement 
for libelf)"
 HOMEPAGE="http://elfutils.org/;
 SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.185-patches.tar.gz;
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
@@ -36,20 +37,14 @@ BDEPEND="nls? ( sys-devel/gettext )
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
-   "${FILESDIR}"/${PN}-0.177-disable-large.patch
-   "${FILESDIR}"/${PN}-0.180-PaX-support.patch
-   "${FILESDIR}"/${PN}-0.185-static-inline.patch
-   "${FILESDIR}"/${PN}-0.185-pull-advance_pc-in-file-scope.patch
-   
"${FILESDIR}"/${PN}-0.185-configure.ac-rework-gnu99-ext-check-to-allow-clang.patch
-   "${FILESDIR}"/${PN}-0.185-glibc-2.34-test-failure.patch
+   "${WORKDIR}"/${PN}-0.185-patches/
 )
 
 src_prepare() {
default
 
if use elibc_musl; then
-   eapply "${FILESDIR}"/musl/
+   eapply "${WORKDIR}"/${PN}-0.185-patches/musl/
fi
 
if ! use static-libs; then

diff --git a/dev-libs/elfutils/elfutils-0.186.ebuild 
b/dev-libs/elfutils/elfutils-0.186.ebuild
index d7c479481a35..e8c5b4a6a800 100644
--- a/dev-libs/elfutils/elfutils-0.186.ebuild
+++ b/dev-libs/elfutils/elfutils-0.186.ebuild
@@ -8,6 +8,7 @@ inherit flag-o-matic multilib-minimal
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement 
for libelf)"
 HOMEPAGE="https://elfutils.org/;
 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[Sam James]

commit: 71828c9b2b7e1c8c5c90085694fe2a50b6fac602
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  9 02:55:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  9 02:55:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71828c9b

dev-libs/elfutils: add bug link to arm64 musl patch

Bug: https://bugs.gentoo.org/693772
Signed-off-by: Sam James  gentoo.org>

 dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch 
b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
index 99409540c1e..222c0527b68 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
@@ -1,5 +1,8 @@
 https://www.sourceware.org/bugzilla/show_bug.cgi?id=25832
 
https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+https://bugs.gentoo.org/693772
+
+Other variants/links:
 https://git.alpinelinux.org/aports/tree/main/elfutils/fix-aarch64_fregs.patch
 
https://github.com/gentoo/musl/blob/6450482b9b4463b57ac249c63b7ed796e9874c40/dev-libs/elfutils/files/0.178/fix-aarch64_fregs.patch
 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[Sam James]

commit: b33b10eb76f88a2d41f66ddc7184cb0e783e3d45
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  9 02:50:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  9 02:51:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33b10eb

dev-libs/elfutils: add arm64 patch for musl

Alpine, OE are applying this too, although would prefer
to see some action upstream for this.

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

 .../files/musl/elfutils-0.185-aarch64-regs.patch   | 54 ++
 1 file changed, 54 insertions(+)

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch 
b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
new file mode 100644
index 000..99409540c1e
--- /dev/null
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-aarch64-regs.patch
@@ -0,0 +1,54 @@
+https://www.sourceware.org/bugzilla/show_bug.cgi?id=25832
+https://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
+https://git.alpinelinux.org/aports/tree/main/elfutils/fix-aarch64_fregs.patch
+https://github.com/gentoo/musl/blob/6450482b9b4463b57ac249c63b7ed796e9874c40/dev-libs/elfutils/files/0.178/fix-aarch64_fregs.patch
+
+From: Hongxu Jia 
+Date: Tue, 15 Aug 2017 17:27:30 +0800
+Subject: [PATCH] Fix build on aarch64/musl
+
+Errors
+
+invalid operands to binary & (have 'long double' and 'unsigned int')
+
+error: redefinition
+ of 'struct iovec'
+ struct iovec { void *iov_base; size_t iov_len; };
+^
+Upstream-Status: Pending
+Signed-off-by: Khem Raj 
+
+Rebase to 0.170
+Signed-off-by: Hongxu Jia 
+
+--- a/backends/aarch64_initreg.c
 b/backends/aarch64_initreg.c
+@@ -33,7 +33,7 @@
+ #include "system.h"
+ #include 
+ #if defined(__aarch64__) && defined(__linux__)
+-# include 
++# include 
+ # include 
+ # include 
+ /* Deal with old glibc defining user_pt_regs instead of user_regs_struct.  */
+@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ 
((unused)),
+ 
+   Dwarf_Word dwarf_fregs[32];
+   for (int r = 0; r < 32; r++)
+-dwarf_fregs[r] = fregs.vregs[r] & 0x;
++dwarf_fregs[r] = (unsigned int)fregs.vregs[r] & 0x;
+ 
+   if (! setfunc (64, 32, dwarf_fregs, arg))
+ return false;
+--- a/backends/arm_initreg.c
 b/backends/arm_initreg.c
+@@ -38,7 +38,7 @@
+ #endif
+ 
+ #ifdef __aarch64__
+-# include 
++# include 
+ # include 
+ # include 
+ /* Deal with old glibc defining user_pt_regs instead of user_regs_struct.  */

[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/musl/

[Sam James]

commit: b53bb3b14ff55d4f733cf1d68fa999bbd1a781f8
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  7 06:47:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  7 06:47:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53bb3b1

dev-libs/elfutils: add more metadata/information to musl patches

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

 .../files/musl/elfutils-0.185-error-h.patch | 21 +++--
 .../elfutils/files/musl/elfutils-0.185-macros.patch |  2 ++
 .../files/musl/elfutils-0.185-strndupa.patch|  2 ++
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch 
b/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch
index b9ee9b6e35a..2be63fca48d 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-error-h.patch
@@ -1,20 +1,11 @@
+Should be obsolete with the next release (0.186?).
+
 
https://raw.githubusercontent.com/gentoo/musl/master/dev-libs/elfutils/files/0.178/musl-error_h.patch
+https://sourceware.org/bugzilla/show_bug.cgi?id=21008
 
-From 9cb8fad40329cc6445233af0b6ac3f2adde19c65 Mon Sep 17 00:00:00 2001
-From: 
 Date: Thu, 12 Dec 2019 22:00:47 -0600
 Subject: [PATCH 9/9] Add hacked up error header for non GLIBC machines
 

- lib/error.h | 27 +++
- src/error.h | 27 +++
- 2 files changed, 54 insertions(+)
- create mode 100644 lib/error.h
- create mode 100644 src/error.h
-
-diff --git a/lib/error.h b/lib/error.h
-new file mode 100644
-index 000..ef06827
 --- /dev/null
 +++ b/lib/error.h
 @@ -0,0 +1,27 @@
@@ -45,9 +36,6 @@ index 000..ef06827
 +}
 +
 +#endif/* _ERROR_H_ */
-diff --git a/src/error.h b/src/error.h
-new file mode 100644
-index 000..ef06827
 --- /dev/null
 +++ b/src/error.h
 @@ -0,0 +1,27 @@
@@ -78,6 +66,3 @@ index 000..ef06827
 +}
 +
 +#endif/* _ERROR_H_ */
--- 
-2.24.1
-

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch 
b/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch
index 3dbfdb6f7b3..6ab2e96548b 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-macros.patch
@@ -1,3 +1,5 @@
+May not be required (or at least some hunks) with next release (0.186?)
+
 https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch
 --- a/src/arlib.h
 +++ b/src/arlib.h

diff --git a/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch 
b/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch
index 4175e28fd62..030bc779c61 100644
--- a/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch
+++ b/dev-libs/elfutils/files/musl/elfutils-0.185-strndupa.patch
@@ -1,3 +1,5 @@
+Should be fixed in next release (0.186?).
+
 
https://sourceware.org/git/?p=elfutils.git;a=commit;h=e7e4c92650892cf67210be5ea89ffba967427cbf
 https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch
 --- a/src/unstrip.c