Skip to content

3.12 -- Backport of Fix clash between folders in lib and usable libraries #845

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

Draft
hmaarrfk wants to merge 2 commits into
base: 3.12
Choose a base branch
from
+6 −7
Draft

3.12 -- Backport of Fix clash between folders in lib and usable libraries #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a57ffc
3.12 -- Backport of Fix clash between folders in lib and usable libra…
hmaarrfk Jan 22, 2026
623db5f
check major only
isuruf Dec 2, 2025
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
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
Expand Down
9 changes: 4 additions & 5 deletions recipe/patches/0003-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <mingw.android@gmail.com>
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 ++++
Expand All @@ -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):
Expand All @@ -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
+
Expand Down
2 changes: 1 addition & 1 deletion recipe/run_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down