mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-29 16:24:10 +00:00
libev: 4.19 -> 4.20
Tested using stdenv and clangStdenv
This commit is contained in:
parent
d9813ed4ac
commit
a3e7a84d36
@ -2,18 +2,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libev-${version}";
|
name = "libev-${version}";
|
||||||
version="4.19";
|
version="4.20";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
|
url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
|
||||||
sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48";
|
sha256 = "17j47pbkr65a18mfvy2861p5k7w4pxmdgiw723ryfqd9gx636w7q";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./noreturn.patch ];
|
|
||||||
|
|
||||||
# Version 4.19 is not valid C11 (which Clang default to)
|
|
||||||
# Check if this is still necessary on upgrade
|
|
||||||
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=c99" else null;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A high-performance event loop/event model with lots of features";
|
description = "A high-performance event loop/event model with lots of features";
|
||||||
maintainers = [ stdenv.lib.maintainers.raskin ];
|
maintainers = [ stdenv.lib.maintainers.raskin ];
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/ev.c b/ev.c
|
|
||||||
index 6f36c6d..b8a1c5f 100644
|
|
||||||
--- a/ev.c
|
|
||||||
+++ b/ev.c
|
|
||||||
@@ -1026,7 +1026,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (
|
|
||||||
#define ecb_unreachable() __builtin_unreachable ()
|
|
||||||
#else
|
|
||||||
/* this seems to work fine, but gcc always emits a warning for it :/ */
|
|
||||||
- ecb_inline void ecb_unreachable (void) ecb_noreturn;
|
|
||||||
+ ecb_inline ecb_noreturn void ecb_unreachable (void);
|
|
||||||
ecb_inline void ecb_unreachable (void) { }
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user