From gitlab-mirror at kemper.freedesktop.org Thu May 1 05:57:20 2025 From: gitlab-mirror at kemper.freedesktop.org (GitLab Mirror) Date: Thu, 1 May 2025 05:57:20 +0000 (UTC) Subject: 2 commits - util/cairo-fdr util/cairo-trace Message-ID: <20250501055720.ABA277617F@kemper.freedesktop.org> util/cairo-fdr/meson.build | 1 - util/cairo-trace/meson.build | 1 - 2 files changed, 2 deletions(-) New commits: commit 2e2080247f0149e1bd9e24013693bffbcd06cb0b Merge: 7fd0cd0a9 b35a9ead9 Author: Uli Schlachter Date: Thu May 1 05:57:15 2025 +0000 Merge branch 'fix-symbol-interposition' into 'master' Fix cairo-fdr and cairo-trace See merge request cairo/cairo!608 commit b35a9ead9744552ad4e71fe3b12929ab330f8acf Author: Uli Schlachter Date: Fri Jan 31 18:10:47 2025 +0100 Fix cairo-fdr and cairo-trace This partially reverts commit ba4d5fbd5 from MR !343 which asked for hidden symbols everywhere. cairo-fdr and cairo-trace explicitly try to interpose existing symbols. Changing them to hidden symbols breaks these tools. See: https://gitlab.freedesktop.org/cairo/cairo/-/issues/882#note_2759005 Signed-off-by: Uli Schlachter diff --git a/util/cairo-fdr/meson.build b/util/cairo-fdr/meson.build index 0d00e43f7..c333bf765 100644 --- a/util/cairo-fdr/meson.build +++ b/util/cairo-fdr/meson.build @@ -5,7 +5,6 @@ cairo_fdr_sources = [ libcairofdr = library('cairo-fdr', cairo_fdr_sources, include_directories: [incbase, incsrc], dependencies: deps, - gnu_symbol_visibility: 'hidden', link_args: extra_link_args, install: true, install_dir: get_option('libdir') / 'cairo', diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build index 8d4ac131b..f088c774c 100644 --- a/util/cairo-trace/meson.build +++ b/util/cairo-trace/meson.build @@ -13,7 +13,6 @@ libcairotrace = library('cairo-trace', cairo_trace_sources, dependencies: deps, c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext),] + pthread_c_args, link_args: extra_link_args, - gnu_symbol_visibility: 'hidden', install: true, install_dir: get_option('libdir') / 'cairo', )