mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: add rpath to modules that use symbols from libexec_weston

Browse Source 
The cms-static, desktop-shell, hmi-controller, ivi-shell, and screen-share
modules use symbols from libexec_weston, e.g.:

  $ ldd /usr/lib/x86_64-linux-gnu/weston/desktop-shell.so | grep "not found"
  	libexec_weston.so.0 => not found

Loading these modules from weston happens to work because the weston executable
itself links against libexec_weston, and has an rpath set. Still, these modules
depend on a library in a non-standard location. Adding an rpath could help
static checkers to make sure all shared objects' dependencies are present.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel
2020-02-05 00:40:01 +01:00
committed by Pekka Paalanen
parent 741fca40b5
commit 4b1de0112b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/meson.build
+4 -2
View File
@@ -90,7 +90,8 @@ if get_option('screenshare')
dependencies: deps_screenshare, dependencies: deps_screenshare,
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston,
install_rpath: '$ORIGIN'
) )
env_modmap += 'screen-share.so=@0@;'.format(plugin_screenshare.full_path()) env_modmap += 'screen-share.so=@0@;'.format(plugin_screenshare.full_path())
endif endif
@@ -115,7 +116,8 @@ if get_option('color-management-lcms')
dependencies: [ dep_libexec_weston, dep_libweston_public, dep_lcms2 ], dependencies: [ dep_libexec_weston, dep_libweston_public, dep_lcms2 ],
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston,
install_rpath: '$ORIGIN'
) )
env_modmap += 'cms-static.so=@0@;'.format(plugin_lcms.full_path()) env_modmap += 'cms-static.so=@0@;'.format(plugin_lcms.full_path())
endif endif
desktop-shell/meson.build
+2 -1
View File
@@ -24,7 +24,8 @@ if get_option('shell-desktop')
dependencies: deps_shell_desktop, dependencies: deps_shell_desktop,
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston,
install_rpath: '$ORIGIN'
) )
env_modmap += 'desktop-shell.so=@0@;'.format(plugin_shell_desktop.full_path()) env_modmap += 'desktop-shell.so=@0@;'.format(plugin_shell_desktop.full_path())
endif endif
ivi-shell/meson.build
+4 -2
View File
@@ -20,7 +20,8 @@ if get_option('shell-ivi')
], ],
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston,
install_rpath: '$ORIGIN'
) )
env_modmap += 'ivi-shell.so=@0@;'.format(plugin_shell_ivi.full_path()) env_modmap += 'ivi-shell.so=@0@;'.format(plugin_shell_ivi.full_path())
@@ -42,7 +43,8 @@ if get_option('shell-ivi')
], ],
name_prefix: '', name_prefix: '',
install: true, install: true,
install_dir: dir_module_weston install_dir: dir_module_weston,
install_rpath: '$ORIGIN'
) )
env_modmap += 'hmi-controller.so=@0@;'.format(plugin_ivi_hmi.full_path()) env_modmap += 'hmi-controller.so=@0@;'.format(plugin_ivi_hmi.full_path())