Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Fixes needed for gappy v0.1.0a2 which did away with the libgap_soname
Browse files Browse the repository at this point in the history
argument.

We also don't need sage.env.GAP_SO anymore. gappy detects the path to
the shared library automatically and doesn't need this, and it isn't
used anywhere else in Sage.
  • Loading branch information
embray committed Feb 4, 2021
1 parent baa0f61 commit a07f20e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 1 addition & 3 deletions src/sage/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ def _get_shared_lib_path(*libnames: str) -> Optional[str]:
search_directories.append(libdir)

multiarchlib = sysconfig.get_config_var('MULTIARCH')
if multiarchlib is not None:
if multiarchlib is not None:
search_directories.append(libdir / multiarchlib),

patterns = [f'lib{libname}.{ext}']
Expand All @@ -299,8 +299,6 @@ def _get_shared_lib_path(*libnames: str) -> Optional[str]:
# On Debian it's libsingular-Singular so try that as well
SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular"))

# locate libgap shared object
GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", ""))

# post process
if ' ' in DOT_SAGE:
Expand Down
3 changes: 1 addition & 2 deletions src/sage/libs/gap/libgap.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ from gappy.gapobj import GapObj
from gappy.gap_includes cimport Obj
from gappy.gap_globals import common_gap_globals

import sage.env
from sage.interfaces.gap_workspace import prepare_workspace_dir
from sage.misc.cachefunc import cached_method
from sage.misc.randstate cimport current_randstate
Expand Down Expand Up @@ -252,7 +251,7 @@ cdef class SageGappy(Gappy):
def __init__(self):
workspace, _ = get_workspace()
Gappy.__init__(self, gap_root=gap_root(), workspace=workspace,
autoload=True, libgap_soname=sage.env.GAP_SO)
autoload=True)

cpdef initialize(self):
initializing = Gappy.initialize(self)
Expand Down

0 comments on commit a07f20e

Please sign in to comment.