pyrox.dev
lol
keyutils: fix build with llvm/clang (#104930)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
authored by
Christian Kampka
Sandro
and committed by
GitHub
6715796a
ce60c220
+32
+28
pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch
+28
pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch
···
1
+
From 59d91e57d103fb4686d2f45ee3c688878244367a Mon Sep 17 00:00:00 2001
2
+
From: Christian Kampka <christian@kampka.net>
3
+
Date: Tue, 24 Nov 2020 22:12:40 +0100
4
+
Subject: [PATCH] Remove unused function 'after_eq'
5
+
6
+
---
7
+
keyctl_watch.c | 5 -----
8
+
1 file changed, 5 deletions(-)
9
+
10
+
diff --git a/keyctl_watch.c b/keyctl_watch.c
11
+
index a70a19a..c4ca7f7 100644
12
+
--- a/keyctl_watch.c
13
+
+++ b/keyctl_watch.c
14
+
@@ -47,11 +47,6 @@ static struct watch_notification_filter filter = {
15
+
},
16
+
};
17
+
18
+
-static inline bool after_eq(unsigned int a, unsigned int b)
19
+
-{
20
+
- return (signed int)(a - b) >= 0;
21
+
-}
22
+
-
23
+
static void consumer_term(int sig)
24
+
{
25
+
consumer_stop = 1;
26
+
--
27
+
2.28.0
28
+
+4
pkgs/os-specific/linux/keyutils/default.nix
+4
pkgs/os-specific/linux/keyutils/default.nix
···
21
21
sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm";
22
22
})
23
23
./conf-symlink.patch
24
+
# This patch solves a duplicate symbol error when building with a clang stdenv
25
+
# Before removing this patch, please ensure the package still builds by running eg.
26
+
# nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }'
27
+
./0001-Remove-unused-function-after_eq.patch
24
28
];
25
29
26
30
makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";