Skip to content

3.13 -- Backport of Fix clash between folders in lib and usable libraries #846

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 1 commit into
base: 3.13
Choose a base branch
from
+5 −6
Draft

3.13 -- Backport of Fix clash between folders in lib and usable libraries #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 = 0 %}
{% set build_number = 1 %}

# 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 2744ccebb04a75e66d943b16a1899237d358f122 Mon Sep 17 00:00:00 2001
From 24c5979ae5cf7febe41ad52060b248493735c517 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/24] 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 117bf06cb01..2e9fa474ace 100644
index 117bf06cb01..a9b61aab8c0 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 117bf06cb01..2e9fa474ace 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