From b5408a0879b82101f69b6bf3bc29b6e9e4969941 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 18 Jul 2022 02:33:38 +0100
Subject: gentoo auto-resync : 18:07:2022 - 02:33:38

---
 dev-util/debugedit/Manifest                        |  3 +-
 dev-util/debugedit/debugedit-5.0-r1.ebuild         |  1 +
 .../files/debugedit-5.0-musl-error.h-fix.patch     | 50 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 dev-util/debugedit/files/debugedit-5.0-musl-error.h-fix.patch

(limited to 'dev-util/debugedit')

diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 4a125c1b6888..6ffb0636918e 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,7 +1,8 @@
 AUX debugedit-5.0-hppa.patch 774 BLAKE2B 4e0cec167f3763901105571bdd7e489638e707eb04170a0786bb74604162d79e97d79a84ab1811a3199dc4b3e0f55109ce5a5cbab213ca7ef2e1c3ad59f2ae3d SHA512 30e212157f98ea26f28f3ed14c4ac658715417c8e0b9e7dd58fc3064a2687bb972b960b5539f87e8bc919cd6b67a7ff33d2005e62bb2a64e3f6b7b6fd44e8f28
+AUX debugedit-5.0-musl-error.h-fix.patch 1472 BLAKE2B 8d6bb2141d0fcff817591801a050afabed39929efda9b8b657c76bfc43a35a1e5b29db94c0445a37264c9c31474cfe2acdf4c62ebf4315ded9c581cb1b0f2427 SHA512 08d1991b2dae7ddf2edc99e4e7edef9d44434d006c7274ba2de5c64d5abd1ff3fc3960342dccef966a35ab3f20b488d3856d7157d1312f230c618c3f84562fbd
 AUX debugedit-5.0-readelf.patch 13298 BLAKE2B 40a561495ea4186c9565482c73f24fc5dfc2842e3a681fe988dfcca71aa518a95deb08f9423455bb23a38c05d6e7c641050519dc5ce0756732347293e8bcdcbe SHA512 0a2fd64a2716a720fd8d25929a9369d3691ece63af6bae363246766c60055c0441b821934df13e4fd70f3464e072c8f0f2d18634d7dadbb0fa253704ce4e658f
 AUX debugedit-5.0-zero-dir-entry.patch 4172 BLAKE2B 8eddb4deb23304576df6730e4b5b517ea700c8be6d5b2617dc51cc27b975b07fbaccbe2ab656dff99287fdcd7f1f13dc8c3f3fc4378ef7edad26d83e8b688848 SHA512 f9f3a3db717033f7a4909d66d938051e525a6e6ebc238e898d54b503b9e4e99b068c04be4b57454fc188cfcd2cd56e2528875613c24da94ce5931a1b60942cb2
 DIST debugedit-5.0.tar.xz 164820 BLAKE2B 8e79f930a7e5c91709b1646794412836fff0b08da17a4b54beac4752a3f62c7418e3e8b8f7f3c3111ba375d6c672fee0f4279632bab3fb406a2fdd75a9e81a64 SHA512 7e7f529eafe41b53f0b5bfc58282fdbfa0dfa93ed7908b70e81942d6d2b6f80fc9c6bff2ed9674fd98947e5750b615f4c8b222544989e2900c5f8ff5ae0efb92
 DIST debugedit-5.0.tar.xz.sig 310 BLAKE2B bd8b092e400575fa62f759e4fd2e6bbfc9dbd77da2a363bd13c98b32794d515fbe7987824874b9c4be048e458c334bccb74082a78d845f07429b150083f2bcbf SHA512 2223841eb6c63616dc24028e8076ab9d82579e8d6efa4bba45e5dbd0eb181c947feae6f944136f3504a78678569ae96dc6c4a0dd4e7012bd9aa522b0f7525dc9
-EBUILD debugedit-5.0-r1.ebuild 901 BLAKE2B 03cc27ddf322683b457950af79acbb437dcf1090376fbfcec840b17953c18ad2aebb120b1df9e13a5cd1175b9d51ede36ed23fca778066e61fc7704c23cc6317 SHA512 f88d69f197a96a27f094b155cc0ebf03d911cc4a670ecda62932095e3f5a6726aa62e80fe03e8307c26915e8fd090379e2f1e17e79089b131fb4554705c17657
+EBUILD debugedit-5.0-r1.ebuild 944 BLAKE2B 2242b39af8dbdc11673db3fad3364e3d0771233b2a8a8e2116b0d4ea08e2564ca9b9c99a08290e62a69b45f05f250347280b09428041db28eb16eb793d0e9490 SHA512 d83f1c03598a00dc20b340ff7b25d7f2f98efc871d8fc51639bf730aaf248ed6164ad09cd482fcdf19a53ed3ef3a1a28637b24aaaca8c4a74675bb3a4bf4c139
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-util/debugedit/debugedit-5.0-r1.ebuild b/dev-util/debugedit/debugedit-5.0-r1.ebuild
index 18f1e7b7cde5..f510f92c003b 100644
--- a/dev-util/debugedit/debugedit-5.0-r1.ebuild
+++ b/dev-util/debugedit/debugedit-5.0-r1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-readelf.patch
 	"${FILESDIR}"/${P}-zero-dir-entry.patch
 	"${FILESDIR}"/${P}-hppa.patch
+	"${FILESDIR}"/${P}-musl-error.h-fix.patch
 )
 
 src_prepare() {
diff --git a/dev-util/debugedit/files/debugedit-5.0-musl-error.h-fix.patch b/dev-util/debugedit/files/debugedit-5.0-musl-error.h-fix.patch
new file mode 100644
index 000000000000..4c7f23911108
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-5.0-musl-error.h-fix.patch
@@ -0,0 +1,50 @@
+# musl doesn't provide error.h as a result debugedit is failing to build on
+# musl.
+#
+# With advice from developer Anthony G. Basile <blueness@gentoo.org> I went
+# with creating a define that redefines the err function. The major
+# improvements over the previous implementation is that this time the patch is
+# smaller and more readable compared to previous implementation.
+#
+# Closes: https://bugs.gentoo.org/714206
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,8 @@ PKG_CHECK_MODULES([LIBDW], [libdw])
+
+ # Checks for header files.
+ AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h])
++AC_CHECK_HEADERS([error.h],
++		 [AC_DEFINE(HAVE_ERROR_H, 1, [has error.h -- non musl system])])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_CHECK_HEADER_STDBOOL
+--- a/tools/debugedit.c
++++ b/tools/debugedit.c
+@@ -25,7 +25,12 @@
+ #include <byteswap.h>
+ #include <endian.h>
+ #include <errno.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#else
++#include <err.h>
++#define error(status, errno, ...) err(status, __VA_ARGS__)
++#endif
+ #include <limits.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- a/tools/sepdebugcrcfix.c
++++ b/tools/sepdebugcrcfix.c
+@@ -29,7 +29,12 @@
+ #include <endian.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#else
++#include <err.h>
++#define error(status, errno, ...) err(status, __VA_ARGS__)
++#endif
+ #include <libelf.h>
+ #include <gelf.h>
+
-- 
cgit v1.2.3