Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit e67fc51

Browse files
author
Release Manager
committed
Trac #31148: MR51: Allow Matplotlib to use system qhull >= 7.2.0
zlscherr ([https://gitlab.com/zlscherr @zlscherr]) opened a merge request at https://gitlab.com/sagemath/sage/-/merge_requests/51: ---- {{{ #!markdown My system has qhull 8.0.0 installed. Because Matplotlib doesn't know about my system qhull it builds its own version. This can cause runtime issues with Matplotlib trying to call the wrong qhull library. For example, this fixes the error that ```bash $ ./sage -tp 8 --long src/sage/plot/plot3d/list_plot3d.py ``` produces ```bash QH6249 qh_lib_check: Incorrect qhull library called. Size of qhT for caller is 2896, but for library is 2792. QH6256 qh_lib_check: Cannot continue. Library 'qhull 7.2.0 (2015.2 2016/01/18)' uses a static qhT (e.g., libqhull.so) ``` if the system has qhull 8.0.0 installed. }}} URL: https://trac.sagemath.org/31148 Reported by: galois Ticket author(s): Zachary Scherr Reviewer(s): Dima Pasechnik
2 parents f3740e8 + 6a36667 commit e67fc51

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

build/pkgs/configure/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=d943b8d6b08af3eed1cf04271248ec330e5059b4
3-
md5=9ff8d31f1beed3dff6f72d4ba2c52004
4-
cksum=1571192709
2+
sha1=7a90fb55449eb88f17000adfd91518bf490983a0
3+
md5=466bf6926d0a4607ef027ac801d3eb58
4+
cksum=691624164
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11cbcc3c2ce73c7235eb1b90041b7ecd83b5a10d
1+
36b6db77e28bde3f23577662ff6a03064252f758

build/pkgs/matplotlib/make-setup-config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from configparser import ConfigParser
2+
import pkgconfig
23
import os
34

45
config = ConfigParser()
@@ -8,6 +9,8 @@
89

910
config.add_section('libs')
1011
config.set('libs', 'system_freetype', 'True')
12+
if pkgconfig.installed('qhull', '>= 7.2.0'):
13+
config.set('libs', 'system_qhull', 'True')
1114
# lto is problematic if we mix libraries from the OS with our own libraries,
1215
# which are not necessarily compiled with the same gcc version
1316
# https://trac.sagemath.org/ticket/27754

0 commit comments

Comments
 (0)