Commit 4b1de011 authored by Philipp Zabel's avatar Philipp Zabel Committed by Pekka Paalanen

build: add rpath to modules that use symbols from libexec_weston

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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 741fca40
...@@ -90,7 +90,8 @@ if get_option('screenshare') ...@@ -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') ...@@ -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
......
...@@ -24,7 +24,8 @@ if get_option('shell-desktop') ...@@ -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
...@@ -20,7 +20,8 @@ if get_option('shell-ivi') ...@@ -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') ...@@ -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())
......
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