diff --git a/recipe/gh3897.patch b/recipe/gh3897.patch new file mode 100644 index 000000000..b1af747f8 --- /dev/null +++ b/recipe/gh3897.patch @@ -0,0 +1,22 @@ +From 75f7aa6edb8407f21f189fb37f8468ee5c1f3ade Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +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]) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5e108271b..0f2b528bb 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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