HACK: Disable kernel_user_helpers on armel

diff --git a/debian/patches/series b/debian/patches/series
index 65825c9e6682987737e0dfeb70c5bcc17f1ad2b5..2cb85fd930944978b70a1bb50ad44f2e401cf0ab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,9 @@ u-ignore-reproducible-failure.patch
 u-reproducible-build.patch
 u-ignore-endian-big-diff.patch
 
+# should be replaced with a proper fix once fixed upstream
+u-hack-armel-no-kernel-user-helpers.patch
+
 # not forwarded, or forwarded but unlikely to be merged
 u-ignore-ppc-hangs.patch
 u-ignore-bpf-test.patch

diff --git a/debian/patches/u-hack-armel-no-kernel-user-helpers.patch b/debian/patches/u-hack-armel-no-kernel-user-helpers.patch
new file mode 100644 (file)
index 0000000..5a39bbb
--- /dev/null
+++ b/debian/patches/u-hack-armel-no-kernel-user-helpers.patch
@@ -0,0 +1,16 @@
+Description: HACK: Disable kernel_user_helpers on armel
+ Workaround to fix the build, should be removed when properly fixed in
+ https://github.com/rust-lang/compiler-builtins/issues/420
+Author: Adrian Bunk <bunk@debian.org>
+
+--- rustc-1.61.0+dfsg1.orig/vendor/compiler_builtins/src/lib.rs
++++ rustc-1.61.0+dfsg1/vendor/compiler_builtins/src/lib.rs
+@@ -54,7 +54,7 @@ pub mod arm;
+ 
+ #[cfg(all(
+     kernel_user_helpers,
+-    any(target_os = "linux", target_os = "android"),
++    any(target_os = "android"),
+     target_arch = "arm"
+ ))]
+ pub mod arm_linux;