Skip to content

Prevent clash with system GDAL #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wonder-sk wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −0
Open

Prevent clash with system GDAL #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions ports/py-rasterio/no-gdal-config-autodetect.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--- a/setup.py
+++ b/setup.py
@@ -233,24 +233,6 @@
log.info("GDAL API version obtained from gdal-config: %s", gdalversion)

if "clean" not in sys.argv:
- try:
- fill_gdal_build_options_using_gdal_config()
- except Exception as e:
- # Try to run gdalinfo and get information from that instead
- log.info(
- "Failed to use gdal-config, trying to run gdalinfo instead (gdal-config error of type %s: %s)",
- type(e).__name__,
- e,
- )
- try:
- fill_gdal_build_options_using_executable(executable_name="gdalinfo")
- except Exception as e:
- log.warning(
- "Failed to get options via both gdal-config and gdalinfo. (gdalinfo error of type %s: %s)",
- type(e).__name__,
- e,
- )
-
# Get GDAL API version from environment variable.
if 'GDAL_VERSION' in os.environ:
gdalversion = os.environ['GDAL_VERSION']
4 changes: 4 additions & 0 deletions ports/py-rasterio/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ library_dirs=${CURRENT_INSTALLED_DIR}/lib
libraries=gdal
")

vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}"
PATCHES no-gdal-config-autodetect.patch
)

vcpkg_python_build_and_install_wheel(SOURCE_PATH "${SOURCE_PATH}")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
Expand Down
Loading