git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #117465 from collares/sage-jmol

tachyon: disable threading on aarch64 to avoid sage test hangs

commit42aad3948cd40ffa02546b41fbe1e23b79a83e0e authorTimo Kaufmann <timokau@zoho.com> dateMon 29 Mar 2021, 21:08 (6 years ago) parent25a75127389afc
3 files changed+23−17
compare with master
unifiedsplit
pkgs/development/libraries/tachyon/default.nix+7−4 pkgs/development/libraries/tachyon/make-archs.patch+4−4 pkgs/development/libraries/tachyon/no-absolute-paths.patch+12−9
pkgs/development/libraries/tachyon/default.nix+7−4
@@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null;
1313
1414stdenv.mkDerivation rec {
1515 pname = "tachyon";
16− version = "0.99b2";
16+ version = "0.99b6";
1717 src = fetchurl {
1818 url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
19− sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v";
19+ sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l";
2020 };
2121 buildInputs = lib.optionals stdenv.isDarwin [
2222 Carbon
@@ -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" \
pkgs/development/libraries/tachyon/no-absolute-paths.patch+12−9
@@ -1,5 +1,4 @@
11diff --git a/unix/Make-config b/unix/Make-config
2−index ee4f388..c1d51d4 100644
32--- a/unix/Make-config
43+++ b/unix/Make-config
54@@ -18,7 +18,7 @@
@@ -11,7 +10,7 @@ index ee4f388..c1d51d4 100644
1110
1211
1312
14−@@ -30,7 +30,7 @@ SHELL=/bin/sh
13+@@ -30,7 +30,7 @@
1514
1615 # The following line should be set to -Ixxx where xxx is your X11 include path
1716 # Sun puts X11 in /usr/openwin/xxx
@@ -20,16 +19,20 @@ index ee4f388..c1d51d4 100644
2019
2120 # Others typically use /usr/X11 or /usr/X11R6
2221 #X11INC= -I/usr/X11
23−@@ -57,7 +57,7 @@ X11LIB= -lX11
22+@@ -105,9 +105,9 @@
2423 ##########################################################################
25−
26− # Standard MPICH installation location
24+ # Customize MPI directories and includes as-needed.
25+ # A typical MPICH installation location:
2726-MPIDIR=/usr/local/mpi
27+-MPIINC=$(MPIDIR)/include
28+-MPILIB=$(MPIDIR)/lib
2829+# MPIDIR=/usr/local/mpi
30++# MPIINC=$(MPIDIR)/include
31++# MPILIB=$(MPIDIR)/lib
2932
30− # UMR CS Dept
31− #MPIDIR=/software/all/mpi
32−@@ -108,9 +108,9 @@ MBOX=
33+ # MPI defines and any flags needed by the local installation.
34+ # Always list -DMPI at a minimum.
35+@@ -166,9 +166,9 @@
3336 # http://www.ijg.org/files/
3437 ##########################################################################
3538 # Uncomment the following lines to disable JPEG support
@@ -42,7 +45,7 @@ index ee4f388..c1d51d4 100644
4245
4346 # Uncomment the following lines to enable JPEG support
4447 #USEJPEG= -DUSEJPEG
45−@@ -128,9 +128,9 @@ JPEGLIB=
48+@@ -186,9 +186,9 @@
4649 # http://www.libpng.org/
4750 ##########################################################################
4851 # Uncomment the following lines to disable PNG support