Commit 60982c75 authored by Swapnil Ingle's avatar Swapnil Ingle Committed by Tomasz Zawadzki
Browse files

Configure vfio-user build options with meson setup



ninja < 1.9 uses per-second granularity timestamps to check if build
options are reconfigured by "meson configure". This granularity is not
sufficient if build.ninja is updated fast enough and which results in
ninja not applying reconfigured build options.

To fix this, commit 510f4c13 added 0.5 second
sleep between "meson setup" and "meson configure" but unfortunately it is not
sufficent and build fails sometimes.

Instead of adding sleep this patch proposes to configure build options with
"meson setup".

Change-Id: Idb66abccc3921873f5397ac4edf401ce7233ad0f
Signed-off-by: default avatarSwapnil Ingle <swapnil.ingle@nutanix.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19319


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJohn Levon <levon@movementarian.org>
Community-CI: Mellanox Build Bot
parent d62a3810
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -18,11 +18,7 @@ all: scan-build

build:
	$(Q)test -d $(VFIO_USER_BUILD_DIR) || \
	     CC=$(SUB_CC) meson setup $(VFIO_USER_BUILD_DIR) $(VFIO_USER_SRC_DIR)
	# Work around pre-v1.9 versions of ninja ignoring new configuration.
	$(Q)[ $$( (ninja --version; echo 1.9) | sort --version-sort | head -n 1) \
	     = 1.9 ] || sleep 0.5
	$(Q)meson configure $(VFIO_USER_BUILD_DIR) $(VFIO_USER_CFG_OPTS)
	     CC=$(SUB_CC) meson setup $(VFIO_USER_CFG_OPTS) $(VFIO_USER_BUILD_DIR) $(VFIO_USER_SRC_DIR)
	$(Q)meson compile $(MESON_COMPILE_OPTS) -C $(VFIO_USER_BUILD_DIR)
	DESTDIR=$(VFIO_USER_INSTALL_DIR) meson install --quiet -C $(VFIO_USER_BUILD_DIR)