Skip to content

Commit

Permalink
Fix Linux binaries
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pkgw committed Jul 15, 2019
1 parent 4a9cad0 commit 983bf59
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
27 changes: 27 additions & 0 deletions recipe/meson-rpaths.patch
Original file line number Diff line number Diff line change
@@ -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,
4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down

0 comments on commit 983bf59

Please sign in to comment.