Skip to content

Commit

Permalink
fix: statically linked plugins require -export-dynamic
Browse files Browse the repository at this point in the history
For about a month plugins have been broken in `org.gnome.Sdk//master`,
apparently because the executable now requires `-export-dynamic`.

Add `export_dynamic: true` to all instances of `executable()` to finally
fix the test suite.
  • Loading branch information
andyholmes committed May 18, 2023
1 parent 38b0617 commit 1cbd157
Show file tree
Hide file tree
Showing 34 changed files with 35 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ valent = executable('valent', 'main.c',
c_args: valent_c_args + release_args,
link_args: valent_link_args,
link_whole: plugins_static,
export_dynamic: true,
gnu_symbol_visibility: 'hidden',
dependencies: libvalent_dep,
install: true,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/clipboard/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_clipboard_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/contacts/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_contacts_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/core/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ foreach test : libvalent_core_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/device/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ foreach test : libvalent_device_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/input/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_input_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/media/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_media_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/mixer/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_mixer_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/notifications/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_notifications_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/session/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ foreach test : libvalent_session_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/libvalent/ui/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ foreach test : libvalent_ui_tests
link_whole: libvalent_test,
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/battery/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ foreach test, test_wrapper : plugin_battery_tests
link_whole: [libvalent_test, plugin_battery],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_wrapper,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/bluez/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ foreach test, test_wrapper : plugin_bluez_tests
link_whole: [libvalent_test, plugin_bluez],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_wrapper,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/clipboard/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ foreach test : plugin_clipboard_tests
link_whole: [libvalent_test, plugin_clipboard],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/connectivity_report/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ foreach test, test_wrapper : plugin_connectivity_report_tests
link_whole: [libvalent_test, plugin_connectivity_report],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_wrapper,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/contacts/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ foreach test : plugin_contacts_tests
link_whole: [libvalent_test, plugin_contacts],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/fdo/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ foreach test, test_wrapper : plugin_fdo_tests
link_whole: [libvalent_test, plugin_fdo],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_wrapper,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/findmyphone/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ foreach test : plugin_findmyphone_tests
link_whole: [libvalent_test, plugin_findmyphone],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/gnome/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ foreach test, test_wrapper : plugin_gnome_tests
link_whole: [libvalent_test, plugin_gnome],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

if not test_wrapper.found()
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/gtk/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ foreach test, test_wrapper : plugin_gtk_tests
link_whole: [libvalent_test, plugin_gtk],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

if not test_wrapper.found()
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/lan/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ foreach test : plugin_lan_tests
link_whole: [libvalent_test, plugin_lan],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/lock/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ foreach test : plugin_lock_tests
link_whole: [libvalent_test, plugin_lock],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/mousepad/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ foreach test : plugin_mousepad_tests
link_whole: [libvalent_test, plugin_mousepad],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/mpris/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ foreach test : plugin_mpris_tests
link_whole: [libvalent_test, plugin_mpris],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
5 changes: 2 additions & 3 deletions tests/plugins/notification/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,15 @@ plugin_notification_tests = [
]

foreach test : plugin_notification_tests
source = ['@0@.c'.format(test)]

test_program = executable(test, source,
test_program = executable(test, '@0@.c'.format(test),
c_args: test_c_args,
dependencies: plugin_notification_test_deps,
include_directories: plugin_notification_include_directories,
link_args: test_link_args,
link_whole: [libvalent_test, plugin_notification],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/photo/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ foreach test : plugin_photo_tests
link_whole: [libvalent_test, plugin_photo],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/ping/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ foreach test : plugin_ping_tests
link_whole: [libvalent_test, plugin_ping],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/presenter/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ foreach test : plugin_presenter_tests
link_whole: [libvalent_test, plugin_presenter],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/runcommand/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ foreach test : plugin_runcommand_tests
link_whole: [libvalent_test, plugin_runcommand],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/sftp/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ foreach test : plugin_sftp_tests
link_whole: [libvalent_test, plugin_sftp],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/share/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ foreach test : plugin_runcommand_tests
link_whole: [libvalent_test, plugin_share],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/sms/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ foreach test : plugin_sms_tests
link_whole: [libvalent_test, plugin_sms],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/systemvolume/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ foreach test : plugin_systemvolume_tests
link_whole: [libvalent_test, plugin_systemvolume],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down
1 change: 1 addition & 0 deletions tests/plugins/telephony/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ foreach test : plugin_telephony_tests
link_whole: [libvalent_test, plugin_telephony],
install: get_option('installed_tests'),
install_dir: installed_tests_execdir,
export_dynamic: true,
)

test(test, test_program,
Expand Down

0 comments on commit 1cbd157

Please sign in to comment.