boringtun: unmark broken on musl
This commit is contained in:
parent
32e9cacd5c
commit
864adfef6f
2 changed files with 26 additions and 1 deletions
|
@ -0,0 +1,26 @@
|
||||||
|
From 3fad8bed118e629a985da17bf7af3de43e1e690b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vlad Krasnov <vkrasnov@users.noreply.github.com>
|
||||||
|
Date: Tue, 2 Apr 2019 07:37:55 -0400
|
||||||
|
Subject: [PATCH] Fix musl build by letting Rust infer the correct type for
|
||||||
|
SIOCGIFMTU (#60)
|
||||||
|
|
||||||
|
---
|
||||||
|
src/device/tun_linux.rs | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/device/tun_linux.rs b/src/device/tun_linux.rs
|
||||||
|
index ffac9c6..7167553 100644
|
||||||
|
--- src/device/tun_linux.rs
|
||||||
|
+++ src/device/tun_linux.rs
|
||||||
|
@@ -122,7 +122,7 @@ impl TunSocket {
|
||||||
|
|
||||||
|
ifr.ifr_name[..iface_name.len()].copy_from_slice(iface_name);
|
||||||
|
|
||||||
|
- if unsafe { ioctl(fd, SIOCGIFMTU, &ifr) } < 0 {
|
||||||
|
+ if unsafe { ioctl(fd, SIOCGIFMTU as _, &ifr) } < 0 {
|
||||||
|
return Err(Error::IOCtl(errno_str()));
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.24.0
|
||||||
|
|
|
@ -11,7 +11,6 @@ distfiles="https://github.com/cloudflare/${pkgname}/archive/v${version}.tar.gz"
|
||||||
checksum=544c72fc482b636e7f6460bfee205adafc55de534067819e4e4914980f0d1350
|
checksum=544c72fc482b636e7f6460bfee205adafc55de534067819e4e4914980f0d1350
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
*-musl) broken="ioctl function signature differs on glibc and musl" ;;
|
|
||||||
ppc*) broken="ftbfs in ring" ;;
|
ppc*) broken="ftbfs in ring" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue