7389afc · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

tachyon: disable threading on aarch64 to avoid sage test hangs

commit7389afce90b3b1b8ffa0701b46cd58a5a0e47faa authorMauricio Collares <mauricio@collares.org> dateWed 24 Mar 2021, 23:05 (6 years ago) parentef4b0a0

2 files changed+9−6

unifiedsplit

pkgs/development/libraries/tachyon/default.nix+5−2

@@ -36,8 +36,11 @@ stdenv.mkDerivation rec {

3636 '';

3737 arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-64-thr" else

3838 if stdenv.hostPlatform.system == "i686-linux" then "linux-thr" else

39− if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm-thr" else

40− if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm-thr" else

39+ # 2021-03-29: multithread (-DTHR -D_REENTRANT) was disabled on linux-arm

40+ # because it caused Sage's 3D plotting tests to hang indefinitely.

41+ # see https://github.com/NixOS/nixpkgs/pull/117465

42+ if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm" else

43+ if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm" else

4144 if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx-thr" else

4245 if stdenv.hostPlatform.system == "i686-darwin" then "macosx-64-thr" else

4346 if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else

pkgs/development/libraries/tachyon/make-archs.patch+4−4

@@ -22,11 +22,11 @@ index 08afb85..dbeb691 100644

2222 "RANLIB = ranlib" \

2323 "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"

2424

25−+# Linux Arm using gcc, with threads

26−+linux-arm-thr:

25++# Linux Arm using gcc

26++linux-arm:

2727+ $(MAKE) all \

28−+ "ARCH = linux-arm-thr" \

29−+ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \

28++ "ARCH = linux-arm" \

29++ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \

3030+ "ARFLAGS = r" \

3131+ "STRIP = strip" \

3232+ "RANLIB = ranlib" \