libfyaml: fixed building issues (#515614)
This commit is contained in:
@@ -25,10 +25,29 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.diff";
|
||||
hash = "sha256-aDubIn+et+1fWE7XU7a5AGZVacVFbAbC1PoSDrA6hXw=";
|
||||
})
|
||||
# backport "Fix C11 atomics detection and buggy macros for C++ compatibility"
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pantoniou/libfyaml/commit/1026d76850909dc9b1c5f95b8cd94e865a313fd5.diff";
|
||||
hash = "sha256-0YfOqdqHdELFMqr52TDAC3BNFLkcuxvuJY5b9yZ7NFk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.diff";
|
||||
hash = "sha256-cNL9wQtxIRg/ShZLJP4qHYNFRrYo9kRG+/U+3FiUeaI=";
|
||||
})
|
||||
# On Darwin, AX_PTHREAD returns empty PTHREAD_LIBS with -pthread in PTHREAD_CFLAGS;
|
||||
# don't force -lpthread when PTHREAD_CFLAGS already provides pthread support.
|
||||
# Pending PR: https://github.com/pantoniou/libfyaml/pull/294
|
||||
./pthread-darwin.patch
|
||||
|
||||
# backport "build: don't output 'none required' to LIBM if no linker flags needed for it"
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pantoniou/libfyaml/commit/24b18e7363b336962fe160c1dc05ca57ba95783c.diff";
|
||||
hash = "sha256-g5QKI4HuS8MEQ9ddIQNC0j+28Dh9zLAp5RaZX5SWBHk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pantoniou/libfyaml/commit/9f2492ca27bb1fda64f2b12edc2da17406208b93.diff";
|
||||
hash = "sha256-E4wS+P7R3VGrBpD7swWMMi/QPTF+9rzAeEyxhbmdiwk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -99,6 +99,7 @@
|
||||
AX_PTHREAD([], [AC_MSG_ERROR("Missing required pthread support")])
|
||||
|
||||
-# in some cases PTHREAD_LIBS is empty - force -lpthread */
|
||||
-if test "x$PTHREAD_LIBS" = "x"; then
|
||||
+# In some cases PTHREAD_LIBS is empty; force -lpthread only when PTHREAD_CFLAGS
|
||||
+# also provides no pthread support (e.g. on Darwin, -pthread in CFLAGS suffices).
|
||||
+if test "x$PTHREAD_LIBS" = "x" && test "x$PTHREAD_CFLAGS" = "x"; then
|
||||
PTHREAD_LIBS="-lpthread"
|
||||
fi
|
||||
Reference in New Issue
Block a user