Opened 6 years ago

Closed 6 years ago

#21572 closed enhancement (fixed)

Simplify qhull spkg patch

Reported by: Matthias Köppe Owned by:
Priority: major Milestone: sage-7.4
Component: packages: optional Keywords:
Cc: Vincent Delecroix, Jeroen Demeyer, Dima Pasechnik Merged in:
Authors: Matthias Koeppe Reviewers: Jeroen Demeyer
Report Upstream: N/A Work issues:
Branch: 808f960 (Commits, GitHub, GitLab) Commit: 808f96024896b7c40657702e2c663288bce199db
Dependencies: Stopgaps:

Status badges

Description (last modified by Matthias Köppe)

This is for #21534.

The ticket also changes "make -j1" to "$MAKE". The "-j1" should be unnecessary. The Makefile.patch purports to fix the dependency problems of the original Makefile; and a parallel build works for me with it.

Change History (11)

comment:1 Changed 6 years ago by Matthias Köppe

Branch: u/mkoeppe/simplify_qhull_spkg_patch_and_use_sage_local_instead_of_sage_root_local

comment:2 Changed 6 years ago by Matthias Köppe

Authors: Matthias Koeppe
Cc: Jeroen Demeyer added
Commit: ac49e35f36d33e13266a27489621578291736191
Description: modified (diff)
Status: newneeds_review

New commits:

19360c0Don't patch DESTDIR in Makefile, just pass it as an argument
ac49e35Use make -j8, remove -j1 for building

comment:3 Changed 6 years ago by Matthias Köppe

Cc: Dima Pasechnik added

comment:4 Changed 6 years ago by Jeroen Demeyer

Reviewers: Jeroen Demeyer
Summary: Simplify qhull spkg patch and use SAGE_LOCAL instead of SAGE_ROOT/localSimplify qhull spkg patch

comment:5 Changed 6 years ago by Jeroen Demeyer

Branch: u/mkoeppe/simplify_qhull_spkg_patch_and_use_sage_local_instead_of_sage_root_localu/jdemeyer/simplify_qhull_spkg_patch_and_use_sage_local_instead_of_sage_root_local

comment:6 Changed 6 years ago by Jeroen Demeyer

Commit: ac49e35f36d33e13266a2748962157829173619130bf5d5d72a2b73819a41337b7fd8fa814320972

Fixed commit message of last commit


New commits:

30bf5d5Use $MAKE, remove -j1 for building

comment:7 Changed 6 years ago by Jeroen Demeyer

I do get failures with a parallel build:

============================================
== make qtest ==============================
============================================
== Otherwise if user_eg fails to link, switch to -lqhullstatic_r
bin/qconvex
== Sun Sep 25 09:26:10 CEST 2016

============================================
QH6075 == Test non-reentrant qset.c with mem.c ====
qhull input error: short input file.  Did not find dimension and number of points

While executing:  | qconvex
Options selected for Qhull 2015.2 2016/01/18:
  run-id 511880916
Makefile:323: recipe for target 'qconvex-prompt' failed
make: *** [qconvex-prompt] Error 1
make: *** Waiting for unfinished jobs....

comment:8 Changed 6 years ago by git

Commit: 30bf5d5d72a2b73819a41337b7fd8fa814320972808f96024896b7c40657702e2c663288bce199db

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

808f960Use $MAKE instead of make

comment:9 Changed 6 years ago by Jeroen Demeyer

Put back the -j1 option. Please check and then set this to positive_review if you agree.

comment:10 Changed 6 years ago by Matthias Köppe

Status: needs_reviewpositive_review

Thanks for testing this thoroughly.

comment:11 Changed 6 years ago by Volker Braun

Branch: u/jdemeyer/simplify_qhull_spkg_patch_and_use_sage_local_instead_of_sage_root_local808f96024896b7c40657702e2c663288bce199db
Resolution: fixed
Status: positive_reviewclosed
Note: See TracTickets for help on using tickets.