| 1 |
commit: 405e55107265eada57895caab0c39d0b17b5a270 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 13 08:08:00 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 13 08:10:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405e5510 |
| 7 |
|
| 8 |
sys-apps/iproute2: fix build on musl |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831102 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
...route2-5.16.0-fix-ax25.h-include-for-musl.patch | 23 ++++++++++++++++++++++ |
| 14 |
sys-apps/iproute2/iproute2-5.16.0.ebuild | 1 + |
| 15 |
2 files changed, 24 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch b/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..8644a93ba115 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-apps/iproute2/files/iproute2-5.16.0-fix-ax25.h-include-for-musl.patch |
| 22 |
@@ -0,0 +1,23 @@ |
| 23 |
+From: Sam James <sam@g.o> |
| 24 |
+Date: Thu, 13 Jan 2022 08:05:33 +0000 |
| 25 |
+Subject: [PATCH] Fix ax25.h include for musl |
| 26 |
+ |
| 27 |
+ax25.h isn't guaranteed to be avilable in netax25/*; |
| 28 |
+it's dependent on our choice of libc (it's not available |
| 29 |
+on musl at least) [0]. |
| 30 |
+ |
| 31 |
+Let's use the version from linux-headers. |
| 32 |
+ |
| 33 |
+[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers |
| 34 |
+Bug: https://bugs.gentoo.org/831102 |
| 35 |
+--- a/lib/ax25_ntop.c |
| 36 |
++++ b/lib/ax25_ntop.c |
| 37 |
+@@ -2,7 +2,7 @@ |
| 38 |
+ |
| 39 |
+ #include <errno.h> |
| 40 |
+ #include <sys/socket.h> |
| 41 |
+-#include <netax25/ax25.h> |
| 42 |
++#include <linux/ax25.h> |
| 43 |
+ |
| 44 |
+ #include "utils.h" |
| 45 |
+ |
| 46 |
|
| 47 |
diff --git a/sys-apps/iproute2/iproute2-5.16.0.ebuild b/sys-apps/iproute2/iproute2-5.16.0.ebuild |
| 48 |
index c26a054ac839..a86a737045cb 100644 |
| 49 |
--- a/sys-apps/iproute2/iproute2-5.16.0.ebuild |
| 50 |
+++ b/sys-apps/iproute2/iproute2-5.16.0.ebuild |
| 51 |
@@ -50,6 +50,7 @@ PATCHES=( |
| 52 |
"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 |
| 53 |
#"${FILESDIR}"/${PN}-5.1.0-portability.patch |
| 54 |
"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch |
| 55 |
+ "${FILESDIR}"/${PN}-5.16.0-fix-ax25.h-include-for-musl.patch |
| 56 |
) |
| 57 |
|
| 58 |
doecho() { |
Archives