From 983bf59c87ba317d507ce2b06cbfe8580128b2e1 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 15 Jul 2019 17:24:20 -0400 Subject: [PATCH] Fix Linux binaries We ran into another instance of conda-forge/glib-feedstock#40 AKA mesonbuild/meson#4685, in which Meson edits the rpaths of the binaries it installs in a way that breaks future `ldconfig` invocations. From previous investigations, setting an `install_rpath` for the installed binaries avoids the issue, so let's do that. --- recipe/meson-rpaths.patch | 27 +++++++++++++++++++++++++++ recipe/meta.yaml | 4 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 recipe/meson-rpaths.patch diff --git a/recipe/meson-rpaths.patch b/recipe/meson-rpaths.patch new file mode 100644 index 0000000..bde6ab8 --- /dev/null +++ b/recipe/meson-rpaths.patch @@ -0,0 +1,27 @@ +diff --git a/lib/meson.build b/lib/meson.build +index e3691d1..73b09b1 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -78,4 +78,6 @@ libfribidi = library('fribidi', + c_args: ['-DHAVE_CONFIG_H'] + visibility_args, + version: libversion, + soversion: soversion, +- install: true) ++ install: true, ++ install_rpath: join_paths(get_option('prefix'), get_option('libdir')) ++) +diff --git a/bin/meson.build b/bin/meson.build +index 823ed02..e039920 100644 +--- a/bin/meson.build ++++ b/bin/meson.build +@@ -3,7 +3,9 @@ fribidi = executable('fribidi', + c_args: ['-DHAVE_CONFIG_H'], + include_directories: incs, + link_with: libfribidi, +- install: true) ++ install: true, ++ install_rpath: join_paths(get_option('prefix'), get_option('libdir')) ++) + + executable('fribidi-benchmark', + 'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h, diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d253e83..aa4510e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,9 +8,11 @@ package: source: url: https://github.com/fribidi/fribidi/releases/download/v{{ version }}/fribidi-{{ version }}.tar.bz2 sha256: {{ sha256 }} + patches: + - meson-rpaths.patch build: - number: 1001 + number: 1002 skip: true # [win] run_exports: - {{ pin_subpackage('fribidi') }}