Merge pull request #116069 from obsidiansystems/new-mcfgthreads

mcfgthreads: 9570e5ca -> 10y2x3x6
This commit is contained in:
John Ericson 2021-03-13 15:12:10 -05:00 committed by GitHub
commit 312390ca50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 22 deletions

View file

@ -7,8 +7,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "lhmouse";
repo = "mcfgthread";
rev = "9570e5ca7b98002d707c502c919d951bf256b9c6";
sha256 = "10y2x3x601a7c1hkd6zlr3xpfsnlr05xl28v23clf619756a5755";
rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
};
outputs = [ "out" "dev" ];
@ -18,10 +18,6 @@ stdenv.mkDerivation {
rm -r "$sourceRoot/debug" "$sourceRoot/release"
'';
postPatch = ''
substituteInPlace Makefile.am --replace '-Werror' ""
'';
nativeBuildInputs = [
autoreconfHook
];

View file

@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
patches = [
./playtests-darwin.patch
] # This I didn't upstream because if you use posix threads with MinGW it will
# work fine, and I'm not sure how to write the condition.
++ lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch;
];
postPatch = lib.optionalString (!static) ''
substituteInPlace build/cmake/CMakeLists.txt \

View file

@ -1,13 +0,0 @@
diff --git a/programs/Makefile b/programs/Makefile
index 7882fe8c..1e8237bb 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -107,7 +107,7 @@ HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS
ifeq ($(HAVE_THREAD), 1)
THREAD_MSG := ==> building with threading support
THREAD_CPP := -DZSTD_MULTITHREAD
-THREAD_LD := -pthread
+THREAD_LD :=
else
THREAD_MSG := $(NO_THREAD_MSG)
endif