public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117465 from collares/sage-jmol

Browse Source 
tachyon: disable threading on aarch64 to avoid sage test hangs
This commit is contained in:
Timo Kaufmann 2021-03-29 21:08:52 +00:00 committed by GitHub
commit 42aad3948c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/tachyon/default.nix
View File

@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tachyon"; pname = "tachyon";
version = "0.99b2"; version = "0.99b6";
src = fetchurl { src = fetchurl {
url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
sha256 = "04m0bniszyg7ryknj8laj3rl5sspacw5nr45x59j2swcsxmdvn1v"; sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
Carbon Carbon
@ -36,8 +36,11 @@ stdenv.mkDerivation rec {
''; '';
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-64-thr" else arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-64-thr" else
if stdenv.hostPlatform.system == "i686-linux" then "linux-thr" else if stdenv.hostPlatform.system == "i686-linux" then "linux-thr" else
if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm-thr" else # 2021-03-29: multithread (-DTHR -D_REENTRANT) was disabled on linux-arm
if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm-thr" else # because it caused Sage's 3D plotting tests to hang indefinitely.
# see https://github.com/NixOS/nixpkgs/pull/117465
if stdenv.hostPlatform.system == "aarch64-linux" then "linux-arm" else
if stdenv.hostPlatform.system == "armv7l-linux" then "linux-arm" else
if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx-thr" else if stdenv.hostPlatform.system == "x86_64-darwin" then "macosx-thr" else
if stdenv.hostPlatform.system == "i686-darwin" then "macosx-64-thr" else if stdenv.hostPlatform.system == "i686-darwin" then "macosx-64-thr" else
if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else if stdenv.hostPlatform.system == "i686-cygwin" then "win32" else

8
pkgs/development/libraries/tachyon/make-archs.patch
View File

@ -22,11 +22,11 @@ index 08afb85..dbeb691 100644
"RANLIB = ranlib" \ "RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+# Linux Arm using gcc, with threads +# Linux Arm using gcc
+linux-arm-thr: +linux-arm:
+ $(MAKE) all \ + $(MAKE) all \
+ "ARCH = linux-arm-thr" \ + "ARCH = linux-arm" \
+ "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \ + "CFLAGS = -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
+ "ARFLAGS = r" \ + "ARFLAGS = r" \
+ "STRIP = strip" \ + "STRIP = strip" \
+ "RANLIB = ranlib" \ + "RANLIB = ranlib" \

21
pkgs/development/libraries/tachyon/no-absolute-paths.patch
View File

@ -1,5 +1,4 @@
diff --git a/unix/Make-config b/unix/Make-config diff --git a/unix/Make-config b/unix/Make-config
index ee4f388..c1d51d4 100644
--- a/unix/Make-config --- a/unix/Make-config
+++ b/unix/Make-config +++ b/unix/Make-config
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
@ -11,7 +10,7 @@ index ee4f388..c1d51d4 100644
@@ -30,7 +30,7 @@ SHELL=/bin/sh @@ -30,7 +30,7 @@
# The following line should be set to -Ixxx where xxx is your X11 include path # The following line should be set to -Ixxx where xxx is your X11 include path
# Sun puts X11 in /usr/openwin/xxx # Sun puts X11 in /usr/openwin/xxx
@ -20,16 +19,20 @@ index ee4f388..c1d51d4 100644
# Others typically use /usr/X11 or /usr/X11R6 # Others typically use /usr/X11 or /usr/X11R6
#X11INC= -I/usr/X11 #X11INC= -I/usr/X11
@@ -57,7 +57,7 @@ X11LIB= -lX11 @@ -105,9 +105,9 @@
########################################################################## ##########################################################################
# Customize MPI directories and includes as-needed.
# Standard MPICH installation location # A typical MPICH installation location:
-MPIDIR=/usr/local/mpi -MPIDIR=/usr/local/mpi
-MPIINC=$(MPIDIR)/include
-MPILIB=$(MPIDIR)/lib
+# MPIDIR=/usr/local/mpi +# MPIDIR=/usr/local/mpi
+# MPIINC=$(MPIDIR)/include
+# MPILIB=$(MPIDIR)/lib
# UMR CS Dept # MPI defines and any flags needed by the local installation.
#MPIDIR=/software/all/mpi # Always list -DMPI at a minimum.
@@ -108,9 +108,9 @@ MBOX= @@ -166,9 +166,9 @@
# http://www.ijg.org/files/ # http://www.ijg.org/files/
########################################################################## ##########################################################################
# Uncomment the following lines to disable JPEG support # Uncomment the following lines to disable JPEG support
@ -42,7 +45,7 @@ index ee4f388..c1d51d4 100644
# Uncomment the following lines to enable JPEG support # Uncomment the following lines to enable JPEG support
#USEJPEG= -DUSEJPEG #USEJPEG= -DUSEJPEG
@@ -128,9 +128,9 @@ JPEGLIB= @@ -186,9 +186,9 @@
# http://www.libpng.org/ # http://www.libpng.org/
########################################################################## ##########################################################################
# Uncomment the following lines to disable PNG support # Uncomment the following lines to disable PNG support