diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ec94bd6bc..01c58b6d1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set ver2 = '.'.join(version.split('.')[0:2]) %} {% set ver2nd = ''.join(version.split('.')[0:2]) %} {% set ver3nd = ''.join(version.split('.')[0:3]) %} -{% set build_number = 2 %} +{% set build_number = 3 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} diff --git a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 113e0f268..679bfe88f 100644 --- a/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,8 +1,7 @@ -From 45a4096e28d45ad74b9866c1d96a81282e721ecb Mon Sep 17 00:00:00 2001 +From f2994809a2069bc051ec531c3189512142a4aa61 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 07/25] Fix find_library so that it looks in sys.prefix/lib - first +Subject: [PATCH] Fix find_library so that it looks in sys.prefix/lib first --- Lib/ctypes/macholib/dyld.py | 4 ++++ @@ -10,7 +9,7 @@ Subject: [PATCH 07/25] Fix find_library so that it looks in sys.prefix/lib 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index 1c3f8fd38b..82a4b4fd58 100644 +index 1c3f8fd38b0..82a4b4fd58a 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -93,6 +93,10 @@ def dyld_executable_path_search(name, executable_path=None): @@ -25,7 +24,7 @@ index 1c3f8fd38b..82a4b4fd58 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e161..72b46cc481 100644 +index 0c2510e1619..4548cd27a8c 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ def find_library(name): @@ -47,7 +46,7 @@ index 0c2510e161..72b46cc481 100644 + return None + for fullname in (name, "lib%s.so" % (name)): + path = os.path.join(sys.prefix, 'lib', fullname) -+ if os.path.exists(path): ++ if os.path.exists(path) and not os.path.isdir(path): + return path + return None + diff --git a/recipe/run_test.py b/recipe/run_test.py index 8f12f026f..954e693b4 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -98,7 +98,7 @@ import ssl print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION) -CONDA_OPENSSL_VERSION = os.getenv("openssl") +CONDA_OPENSSL_VERSION = os.getenv('openssl').split(".")[0] assert CONDA_OPENSSL_VERSION in ssl.OPENSSL_VERSION # See https://github.com/conda-forge/python-feedstock/issues/718 for context: