Commit 8fb5229a authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

Linux: Unversion libxkbcommon and libwayland-client symbols in sysroot

Trusty and Jessie have symbols unversioned. Thus, unversion the symbols
in Linux sysroot the same way as was done for libdbus.

Bug: 1116384
Change-Id: I2c16584de51141b53536c2a24f992913170a8f34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352948Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#798544}
parent c32a2550
libwayland-client.so.0 libwayland-client0 #MINVER#
wl_array_add@Base 1.4.0
wl_array_copy@Base 1.4.0
wl_array_init@Base 1.4.0
wl_array_release@Base 1.4.0
wl_buffer_interface@Base 1.4.0
wl_callback_interface@Base 1.4.0
wl_compositor_interface@Base 1.4.0
wl_data_device_interface@Base 1.4.0
wl_data_device_manager_interface@Base 1.4.0
wl_data_offer_interface@Base 1.4.0
wl_data_source_interface@Base 1.4.0
wl_display_cancel_read@Base 1.4.0
wl_display_connect@Base 1.4.0
wl_display_connect_to_fd@Base 1.4.0
wl_display_create_queue@Base 1.4.0
wl_display_disconnect@Base 1.4.0
wl_display_dispatch@Base 1.4.0
wl_display_dispatch_pending@Base 1.4.0
wl_display_dispatch_queue@Base 1.4.0
wl_display_dispatch_queue_pending@Base 1.4.0
wl_display_flush@Base 1.4.0
wl_display_get_error@Base 1.4.0
wl_display_get_fd@Base 1.4.0
wl_display_get_protocol_error@Base 1.4.0
wl_display_interface@Base 1.4.0
wl_display_prepare_read@Base 1.4.0
wl_display_prepare_read_queue@Base 1.4.0
wl_display_read_events@Base 1.4.0
wl_display_roundtrip@Base 1.4.0
wl_display_roundtrip_queue@Base 1.4.0
wl_event_queue_destroy@Base 1.4.0
wl_keyboard_interface@Base 1.4.0
wl_list_empty@Base 1.4.0
wl_list_init@Base 1.4.0
wl_list_insert@Base 1.4.0
wl_list_insert_list@Base 1.4.0
wl_list_length@Base 1.4.0
wl_list_remove@Base 1.4.0
wl_log_set_handler_client@Base 1.4.0
wl_output_interface@Base 1.4.0
wl_pointer_interface@Base 1.4.0
wl_proxy_add_dispatcher@Base 1.4.0
wl_proxy_add_listener@Base 1.4.0
wl_proxy_create@Base 1.4.0
wl_proxy_create_wrapper@Base 1.4.0
wl_proxy_destroy@Base 1.4.0
wl_proxy_get_class@Base 1.4.0
wl_proxy_get_id@Base 1.4.0
wl_proxy_get_listener@Base 1.4.0
wl_proxy_get_tag@Base 1.4.0
wl_proxy_get_user_data@Base 1.4.0
wl_proxy_get_version@Base 1.4.0
wl_proxy_marshal@Base 1.4.0
wl_proxy_marshal_array@Base 1.4.0
wl_proxy_marshal_array_constructor@Base 1.4.0
wl_proxy_marshal_array_constructor_versioned@Base 1.4.0
wl_proxy_marshal_constructor@Base 1.4.0
wl_proxy_marshal_constructor_versioned@Base 1.4.0
wl_proxy_set_queue@Base 1.4.0
wl_proxy_set_tag@Base 1.4.0
wl_proxy_set_user_data@Base 1.4.0
wl_proxy_wrapper_destroy@Base 1.4.0
wl_region_interface@Base 1.4.0
wl_registry_interface@Base 1.4.0
wl_seat_interface@Base 1.4.0
wl_shell_interface@Base 1.4.0
wl_shell_surface_interface@Base 1.4.0
wl_shm_interface@Base 1.4.0
wl_shm_pool_interface@Base 1.4.0
wl_subcompositor_interface@Base 1.4.0
wl_subsurface_interface@Base 1.4.0
wl_surface_interface@Base 1.4.0
wl_touch_interface@Base 1.4.0
libxkbcommon.so.0 libxkbcommon0 #MINVER#
xkb_context_get_log_level@Base 0.4.1
xkb_context_get_log_verbosity@Base 0.4.1
xkb_context_get_user_data@Base 0.4.1
xkb_context_include_path_append@Base 0.4.1
xkb_context_include_path_append_default@Base 0.4.1
xkb_context_include_path_clear@Base 0.4.1
xkb_context_include_path_get@Base 0.4.1
xkb_context_include_path_reset_defaults@Base 0.4.1
xkb_context_new@Base 0.4.1
xkb_context_num_include_paths@Base 0.4.1
xkb_context_ref@Base 0.4.1
xkb_context_set_log_fn@Base 0.4.1
xkb_context_set_log_level@Base 0.4.1
xkb_context_set_log_verbosity@Base 0.4.1
xkb_context_set_user_data@Base 0.4.1
xkb_context_unref@Base 0.4.1
xkb_key_get_syms@Base 0.4.1
xkb_key_mod_index_is_consumed@Base 0.4.1
xkb_key_mod_mask_remove_consumed@Base 0.4.1
xkb_key_num_groups@Base 0.4.1
xkb_key_repeats@Base 0.4.1
xkb_keymap_get_as_string@Base 0.4.1
xkb_keymap_key_for_each@Base 0.4.1
xkb_keymap_key_get_syms_by_level@Base 0.4.1
xkb_keymap_key_repeats@Base 0.4.1
xkb_keymap_layout_get_index@Base 0.4.1
xkb_keymap_layout_get_name@Base 0.4.1
xkb_keymap_led_get_index@Base 0.4.1
xkb_keymap_led_get_name@Base 0.4.1
xkb_keymap_max_keycode@Base 0.4.1
xkb_keymap_min_keycode@Base 0.4.1
xkb_keymap_mod_get_index@Base 0.4.1
xkb_keymap_mod_get_name@Base 0.4.1
xkb_keymap_new_from_buffer@Base 0.4.1
xkb_keymap_new_from_file@Base 0.4.1
xkb_keymap_new_from_names@Base 0.4.1
xkb_keymap_new_from_string@Base 0.4.1
xkb_keymap_num_layouts@Base 0.4.1
xkb_keymap_num_layouts_for_key@Base 0.4.1
xkb_keymap_num_leds@Base 0.4.1
xkb_keymap_num_levels_for_key@Base 0.4.1
xkb_keymap_num_mods@Base 0.4.1
xkb_keymap_ref@Base 0.4.1
xkb_keymap_unref@Base 0.4.1
xkb_keysym_from_name@Base 0.4.1
xkb_keysym_get_name@Base 0.4.1
xkb_keysym_to_utf32@Base 0.4.1
xkb_keysym_to_utf8@Base 0.4.1
xkb_map_get_as_string@Base 0.4.1
xkb_map_group_get_index@Base 0.4.1
xkb_map_group_get_name@Base 0.4.1
xkb_map_led_get_index@Base 0.4.1
xkb_map_led_get_name@Base 0.4.1
xkb_map_mod_get_index@Base 0.4.1
xkb_map_mod_get_name@Base 0.4.1
xkb_map_new_from_file@Base 0.4.1
xkb_map_new_from_names@Base 0.4.1
xkb_map_new_from_string@Base 0.4.1
xkb_map_num_groups@Base 0.4.1
xkb_map_num_leds@Base 0.4.1
xkb_map_num_mods@Base 0.4.1
xkb_map_ref@Base 0.4.1
xkb_map_unref@Base 0.4.1
xkb_state_get_keymap@Base 0.4.1
xkb_state_get_map@Base 0.4.1
xkb_state_group_index_is_active@Base 0.4.1
xkb_state_group_name_is_active@Base 0.4.1
xkb_state_key_get_consumed_mods@Base 0.4.1
xkb_state_key_get_layout@Base 0.4.1
xkb_state_key_get_level@Base 0.4.1
xkb_state_key_get_one_sym@Base 0.4.1
xkb_state_key_get_syms@Base 0.4.1
xkb_state_key_get_utf32@Base 0.4.1
xkb_state_key_get_utf8@Base 0.4.1
xkb_state_layout_index_is_active@Base 0.4.1
xkb_state_layout_name_is_active@Base 0.4.1
xkb_state_led_index_is_active@Base 0.4.1
xkb_state_led_name_is_active@Base 0.4.1
xkb_state_mod_index_is_active@Base 0.4.1
xkb_state_mod_index_is_consumed@Base 0.4.1
xkb_state_mod_indices_are_active@Base 0.4.1
xkb_state_mod_mask_remove_consumed@Base 0.4.1
xkb_state_mod_name_is_active@Base 0.4.1
xkb_state_mod_names_are_active@Base 0.4.1
xkb_state_new@Base 0.4.1
xkb_state_ref@Base 0.4.1
xkb_state_serialize_group@Base 0.4.1
xkb_state_serialize_layout@Base 0.4.1
xkb_state_serialize_mods@Base 0.4.1
xkb_state_unref@Base 0.4.1
xkb_state_update_key@Base 0.4.1
xkb_state_update_mask@Base 0.4.1
...@@ -326,16 +326,27 @@ HacksAndPatchesCommon() { ...@@ -326,16 +326,27 @@ HacksAndPatchesCommon() {
sed -i -e 's|/usr/lib/${arch}-${os}/||g' ${lscripts} sed -i -e 's|/usr/lib/${arch}-${os}/||g' ${lscripts}
sed -i -e 's|/lib/${arch}-${os}/||g' ${lscripts} sed -i -e 's|/lib/${arch}-${os}/||g' ${lscripts}
# Unversion libdbus symbols. This is required because libdbus-1-3 # Unversion libdbus, libxkbcommon, and libwayland-client symbols.
# switched from unversioned symbols to versioned ones, and we must # This is required because libdbus-1-3, libwayland-client0 and
# still support distros using the unversioned library. This hack # libxkbcommon0 switched from unversioned symbols to versioned
# can be removed once support for Ubuntu Trusty and Debian Jessie # ones, and we must still support distros using the unversioned library.
# are dropped. # This hack can be removed once support for Ubuntu Trusty and Debian
# Jessie are dropped.
${strip} -R .gnu.version_d -R .gnu.version \ ${strip} -R .gnu.version_d -R .gnu.version \
"${INSTALL_ROOT}/lib/${arch}-${os}/libdbus-1.so.3" "${INSTALL_ROOT}/lib/${arch}-${os}/libdbus-1.so.3"
cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \ cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \
"${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols" "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols"
${strip} -R .gnu.version_d -R .gnu.version \
"${INSTALL_ROOT}/usr/lib/${arch}-${os}/libwayland-client.so.0.3.0"
cp "${SCRIPT_DIR}/libwayland-client-symbols" \
"${INSTALL_ROOT}/debian/libwayland-client0/DEBIAN/symbols"
${strip} -R .gnu.version_d -R .gnu.version \
"${INSTALL_ROOT}/usr/lib/${arch}-${os}/libxkbcommon.so.0.0.0"
cp "${SCRIPT_DIR}/libxkbcommon0-symbols" \
"${INSTALL_ROOT}/debian/libxkbcommon0/DEBIAN/symbols"
# Shared objects depending on libdbus-1.so.3 have unsatisfied undefined # Shared objects depending on libdbus-1.so.3 have unsatisfied undefined
# versioned symbols. To avoid LLD --no-allow-shlib-undefined errors, rewrite # versioned symbols. To avoid LLD --no-allow-shlib-undefined errors, rewrite
# DT_NEEDED entries from libdbus-1.so.3 to a different string. LLD will # DT_NEEDED entries from libdbus-1.so.3 to a different string. LLD will
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment