Skip to content

Commit 10c52e7

Browse files
committed
Update list of GEOS candidate locations in setup.py
1 parent ec91dd4 commit 10c52e7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ since version 1.3.0.
77

88
## [Unreleased]
99

10+
### Added
11+
- Add `"/usr/lib/x86_64-linux-gnu"` to list of candidate locations to
12+
search the GEOS library during installation.
13+
1014
### Changed
1115
- Split lint and test requirements into two separate files.
1216

packages/basemap/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ def get_geos_install_prefix():
3535
candidates = [env_candidate]
3636
else:
3737
candidates = [os.path.expanduser("~/local"), os.path.expanduser("~"),
38-
"/usr/local", "/usr", "/opt/local", "/opt", "/sw"]
38+
"/usr/local", "/usr", "/opt/local", "/opt", "/sw"]
3939

4040
for prefix in candidates:
4141
libfiles = []
42-
libdirs = ["bin", "lib", "lib64"]
42+
libdirs = ["bin", "lib", "lib/x86_64-linux-gnu", "lib64"]
4343
libext = "dll" if os.name == "nt" else "so"
4444
libcode = "{0}geos_c".format("" if os.name == "nt" else "lib")
4545
libname = "{0}*.{1}*".format(libcode, libext)

0 commit comments

Comments
 (0)