Skip to content

Commit

Permalink
build: Remove name suffix workaround on MacOS
Browse files Browse the repository at this point in the history
From glib 2.75.0, g_module_open simply enumerate all possible suffix and
this workaround is not required anymore.

Signed-off-by: Qiu Wenbo <[email protected]>
  • Loading branch information
crab2313 authored and gpoo committed Dec 15, 2023
1 parent 095cc53 commit f906fd0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion backend/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ foreach backend, backend_mime_types: backends
gnu_symbol_visibility: 'hidden',
install: true,
install_dir: ev_backendsdir,
name_suffix: name_suffix,
)

backend_mime_types_conf = configuration_data()
Expand Down
9 changes: 1 addition & 8 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,6 @@ if build_machine.system() == 'windows'
common_ldflags = cc.get_supported_link_arguments('-mwindows')
endif

# GLib on macOS expects so as shared_module suffix, while meson uses dylib by default
if host_machine.system() == 'darwin'
name_suffix = 'so'
else
name_suffix = []
endif

if ev_debug
common_flags += ['-DEV_ENABLE_DEBUG'] + cc.get_supported_arguments([
'-Wnested-externs',
Expand Down Expand Up @@ -143,7 +136,7 @@ po_dir = join_paths(source_root, 'po')

top_inc = include_directories('.')

glib_req_version = '>= 2.74.0'
glib_req_version = '>= 2.75.0'
gtk_req_version = '>= 3.22.0'
hdy_req_version = '>= 1.5.0'
exempi_req_version = '>= 2.0'
Expand Down
1 change: 0 additions & 1 deletion properties/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ if enable_nautilus
link_with: libevproperties,
install: true,
install_dir: nautilus_extension_dir,
name_suffix: name_suffix,
gnu_symbol_visibility: 'hidden',
)
endif

0 comments on commit f906fd0

Please sign in to comment.