Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
mbargull committed Mar 23, 2020
1 parent 7981d92 commit 2d86b03
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
22 changes: 22 additions & 0 deletions recipe/gh3897.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From 75f7aa6edb8407f21f189fb37f8468ee5c1f3ade Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 5 Mar 2020 22:30:30 +0100
Subject: [PATCH] Use patchelf by default

---
conda_build/post.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda_build/post.py b/conda_build/post.py
index 0714701a2..7c4051c29 100644
--- a/conda_build/post.py
+++ b/conda_build/post.py
@@ -544,7 +544,7 @@ def mk_relative_linux(f, prefix, rpaths=('lib',), method=None):
rpath = ':'.join(new)

# check_binary_patchers(elf, prefix, rpath)
- if not method or not patchelf or method.upper() == 'LIEF':
+ if not patchelf or (method and method.upper() == 'LIEF'):
set_rpath(old_matching='*', new_rpath=rpath, file=elf)
else:
call([patchelf, '--force-rpath', '--set-rpath', rpath, elf])
3 changes: 2 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ source:
patches:
- gh3606.patch
- gh3895.patch
- gh3897.patch

build:
number: 1
number: 2
entry_points:
- conda-build = conda_build.cli.main_build:main
- conda-convert = conda_build.cli.main_convert:main
Expand Down

0 comments on commit 2d86b03

Please sign in to comment.