Skip to content

Commit 079c5c3

Browse files
committed
Fix build error on Cygwin due to inappropriate linker flag
1 parent 30ff399 commit 079c5c3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ https://semver.org/spec/v2.0.0.html
1919
- Upgrade documentation and linting dependencies.
2020

2121
### Fixed
22+
- Fix Cygwin build error due to GCC passing `"--enable-new-dtags"` to
23+
the linker (solves issue [#579], thanks to @DWesl for the help).
2224
- Fix deprecated `Image.ANTIALIAS` with `Image.LANCZOS` when `pillow`
23-
version is at least 10.0.0 (PR [#580], thanks to @cgohlke).
25+
version is at least 10.0.0 (PR [#580] by @cgohlke).
2426
- Downgrade upper pin for Cython requirement from 3.1 to 3.0 due to
2527
build error triggered by `_geoslib.pyx` (solves issue [#581]).
2628
- Downgrade lower pin for `numpy` to `>= 1.21` for Python >= 3.8, whose
@@ -977,6 +979,8 @@ https://semver.org/spec/v2.0.0.html
977979
https://github.com/matplotlib/basemap/issues/581
978980
[#580]:
979981
https://github.com/matplotlib/basemap/pull/580
982+
[#579]:
983+
https://github.com/matplotlib/basemap/issues/579
980984
[#573]:
981985
https://github.com/matplotlib/basemap/issues/573
982986
[#564]:

packages/basemap/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def run(self):
111111
library_dirs.append(os.path.join(geos_install_prefix, "lib"))
112112
library_dirs.append(os.path.join(geos_install_prefix, "lib64"))
113113
runtime_library_dirs = library_dirs
114-
if os.name == "nt":
114+
if os.name == "nt" or sys.platform == "cygwin":
115115
# On Windows:
116116
# - DLLs get installed under `bin`.
117117
# - We need to inject later the DLL in the wheel using `data_files`.

0 commit comments

Comments
 (0)