summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHéctor Orón Martínez <zumbi@debian.org>2019-03-28 16:24:42 +0100
committerDaniel Stone <daniel@fooishbar.org>2019-04-09 10:08:23 +0000
commit250f1066ffe0aa76b515725f46c2dba121482ddf (patch)
treef3165ca024fc8ebbd0fc06f66009ee13b86c73c3
parent53d7c243ba0baa052081735b8effff4e2679ce65 (diff)
downloadweston-250f1066ffe0aa76b515725f46c2dba121482ddf.tar.gz
support byte-by-byte reproducible build
build path ends in the final binary package causing the build not to be reproducible byte-by-byte. Reference: https://bugs.debian.org/899358 Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
-rw-r--r--compositor/meson.build2
-rw-r--r--ivi-shell/meson.build2
-rw-r--r--weston.ini.in2
3 files changed, 1 insertions, 5 deletions
diff --git a/compositor/meson.build b/compositor/meson.build
index 3824d6ff..61860a7a 100644
--- a/compositor/meson.build
+++ b/compositor/meson.build
@@ -160,8 +160,6 @@ endif
weston_ini_config = configuration_data()
weston_ini_config.set('bindir', dir_bin)
weston_ini_config.set('libexecdir', dir_libexec)
-weston_ini_config.set('abs_top_srcdir', meson.source_root())
-weston_ini_config.set('abs_top_builddir', meson.build_root())
configure_file(
input: '../weston.ini.in',
output: 'weston.ini',
diff --git a/ivi-shell/meson.build b/ivi-shell/meson.build
index fceaf804..17ab5ea5 100644
--- a/ivi-shell/meson.build
+++ b/ivi-shell/meson.build
@@ -40,8 +40,6 @@ if get_option('shell-ivi')
ivi_test_config = configuration_data()
ivi_test_config.set('bindir', dir_bin)
ivi_test_config.set('libexecdir', dir_libexec)
- ivi_test_config.set('abs_top_srcdir', meson.current_source_dir())
- ivi_test_config.set('abs_top_builddir', meson.current_build_dir())
ivi_test_config.set('plugin_prefix', meson.current_build_dir())
ivi_test_config.set('westondatadir', join_paths(dir_data, 'weston'))
ivi_test_ini = configure_file(
diff --git a/weston.ini.in b/weston.ini.in
index 846ef746..74bcb512 100644
--- a/weston.ini.in
+++ b/weston.ini.in
@@ -38,7 +38,7 @@ path=/usr/bin/google-chrome
[launcher]
icon=/usr/share/icons/gnome/24x24/apps/arts.png
-path=@abs_top_builddir@/weston-flower
+path=@bindir@/weston-flower
[input-method]
path=@libexecdir@/weston-keyboard