diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bd3bd51a7..e3a08b9a3 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 = 1 %} +{% set build_number = 2 %} # this makes the linter happy {% set channel_targets = channel_targets or 'conda-forge main' %} diff --git a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index 74a6844b9..44e1bacfe 100644 --- a/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,8 +1,7 @@ -From dc78dfc446c78f49e86f46b84d0f3ff47bbbb1a0 Mon Sep 17 00:00:00 2001 +From d2c9a52026fcbe57ccf019f9e7870fa94082f7c8 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 03/23] 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 ++++ @@ -25,7 +24,7 @@ index 583c47daff3..ab9b01c87e2 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index c550883e7c7..78b0b014f09 100644 +index c550883e7c7..8f55134805f 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ def find_library(name): @@ -47,7 +46,7 @@ index c550883e7c7..78b0b014f09 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 26880f186..9c37abce8 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -102,7 +102,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: