Skip to content

3.10 -- Fix clash between folders in lib and usable libraries #848

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.10
Choose a base branch
from
Draft

3.10 -- Fix clash between folders in lib and usable libraries #848

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
ab266cc
3.10 -- Fix clash between folders in lib and usable libraries
hmaarrfk Jan 22, 2026
b4c97a3
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 = 2 %}
{% set build_number = 3 %}

# this makes the linter happy
{% set channel_targets = channel_targets or 'conda-forge main' %}
Expand Down
11 changes: 5 additions & 6 deletions recipe/patches/0007-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,16 +1,15 @@
From 45a4096e28d45ad74b9866c1d96a81282e721ecb Mon Sep 17 00:00:00 2001
From f2994809a2069bc051ec531c3189512142a4aa61 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 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 ++++
Lib/ctypes/util.py | 27 ++++++++++++++++++++++++---
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):
Expand All @@ -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):
Expand All @@ -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
+
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 @@ -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:
Expand Down