diff options
| author | Joseph Curtin <jcurtin@stsci.edu> | 2020-02-07 05:50:44 -0500 |
|---|---|---|
| committer | Joseph Curtin <jcurtin@stsci.edu> | 2020-02-07 05:50:44 -0500 |
| commit | 4f9c218e26b61e04730fb8deae5d1e659f2dca82 (patch) | |
| tree | e9c359cac0bb1814b4ce1f47b075cd9fdfa42e3c /django/libgdal.patch | |
| parent | e3b50df58392e1a0281fe947e69870bc8cae6143 (diff) | |
| download | astroconda-etc-4f9c218e26b61e04730fb8deae5d1e659f2dca82.tar.gz | |
Updated Django to version 2.2.9
Diffstat (limited to 'django/libgdal.patch')
| -rw-r--r-- | django/libgdal.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/django/libgdal.patch b/django/libgdal.patch new file mode 100644 index 0000000..56b6906 --- /dev/null +++ b/django/libgdal.patch @@ -0,0 +1,28 @@ +--- Django-2.0.orig/django/contrib/gis/gdal/libgdal.py 2017-12-02 12:36:16.000000000 -0200 ++++ Django-2.0/django/contrib/gis/gdal/libgdal.py 2017-12-06 08:14:42.730016198 -0200 +@@ -1,5 +1,6 @@ + import logging + import os ++import sys + import re + from ctypes import CDLL, CFUNCTYPE, c_char_p, c_int + from ctypes.util import find_library +@@ -10,12 +11,12 @@ + logger = logging.getLogger('django.contrib.gis') + + # Custom library path set? +-try: +- from django.conf import settings +- lib_path = settings.GDAL_LIBRARY_PATH +-except (AttributeError, EnvironmentError, +- ImportError, ImproperlyConfigured): +- lib_path = None ++if 'linux' in sys.platform: ++ lib_path = os.path.join(sys.prefix, 'lib', 'libgdal.so') ++elif 'darwin' in sys.platform: ++ lib_path = os.path.join(sys.prefix, 'lib', 'libgdal.dylib') ++elif os.name == 'nt': ++ lib_path = os.path.join(sys.prefix, 'Library', 'bin', 'gdal201.dll') + + if lib_path: + lib_names = None |