[PATCH xserver 4/4] meson: Move the BUILD_DATE/TIME setup to configure time.

Eric Anholt eric at anholt.net
Fri Sep 1 19:22:59 UTC 2017


By having it as a custom_target with build_always, every "ninja -C
build" would rebuild Xorg for the new date/time, even if the rest of
Xorg didn't change.

We could build the rest of Xorg into a static lib, and regenerate
date/time when the static lib changes and link that into a final Xorg,
but BUILD_DATE/TIME is such a dubious feature (compared to including a
git sha, which is easy with meson) it doesn't seem worth the build
time cost.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 hw/xfree86/common/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index 6ed3f51242c3..e734b3ce29d2 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -65,11 +65,9 @@ if get_option('pciaccess')
     srcs_xorg_common += ['xf86pciBus.c', 'xf86VGAarbiter.c']
 endif
 
-srcs_xorg_common += custom_target(
-    'xf86Build.h',
+srcs_xorg_common += configure_file(
     output: 'xf86Build.h',
-    command: [join_paths(meson.current_source_dir(), 'xf86Build.sh'), '@OUTPUT@'],
-    build_always: true,
+    command: ['sh', join_paths(meson.current_source_dir(), 'xf86Build.sh'), '@OUTPUT@'],
 )
 
 srcs_xorg_common += custom_target(
-- 
2.14.1



More information about the xorg-devel mailing list