Skip to content

Commit

Permalink
Build without USE_WIN32_FILEIO
Browse files Browse the repository at this point in the history
This keeps things consistent with current conda-forge builds of tiff
(and poppler).
  • Loading branch information
dopplershift committed May 5, 2021
1 parent 05880de commit 426ad60
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
15 changes: 15 additions & 0 deletions recipe/disable_win32_fileio.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- setup.py.orig 2021-05-05 12:35:30.000000000 -0600
+++ setup.py 2021-05-05 12:38:18.000000000 -0600
@@ -810,12 +810,6 @@
if feature.tiff:
libs.append(feature.tiff)
defs.append(("HAVE_LIBTIFF", None))
- if sys.platform == "win32":
- # This define needs to be defined if-and-only-if it was defined
- # when compiling LibTIFF. LibTIFF doesn't expose it in `tiffconf.h`,
- # so we have to guess; by default it is defined in all Windows builds.
- # See #4237, #5243, #5359 for more information.
- defs.append(("USE_WIN32_FILEIO", None))
if feature.xcb:
libs.append(feature.xcb)
defs.append(("HAVE_XCB", None))
2 changes: 2 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ source:
build:
number: 0
skip: true # [py==27]
patches:
- disable_win32_fileio.patch

requirements:
build:
Expand Down

0 comments on commit 426ad60

Please sign in to comment.