2 files changed, 12 insertions, 11 deletions

diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 497201f5..54383144 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -13,10 +13,10 @@ EXCLUDE_FROM_WORLD = "1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=412de458544c1cb6a2b512cd399286e2"
 
-SRCREV = "3c7d4fa013297b431da48eff821db7f2e8b90c27"
+SRCREV = "4d76d1acdcd69afcedf1335c810bef5f8e18d95e"
 PV = "4.2+git"
 
-SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/checkpoint-restore/criu.git;branch=criu-dev;protocol=https \
            file://0001-criu-Skip-documentation-install.patch \
            file://0002-criu-Change-libraries-install-directory.patch \
            file://0003-crit-pycriu-build-and-install-wheels.patch \
@@ -55,6 +55,10 @@ export C_INCLUDE_PATH = "${STAGING_INCDIR}/libnl3"
 
 export BUILD_SYS
 export HOST_SYS
+# Upstream's scripts/nmk/scripts/tools.mk defaults HOSTCC to 'cc' (changed
+# from 'gcc' in criu commit 36c63ecb5). The native sysroot doesn't provide
+# an unprefixed 'cc', so set HOSTCC explicitly to bitbake's BUILD_CC.
+export HOSTCC = "${BUILD_CC}"
 export HOSTCFLAGS = "${BUILD_CFLAGS}"
 
 inherit python_setuptools_build_meta
diff --git a/recipes-containers/criu/files/0001-plugins-cuda-pass-DEBUG_PREFIX_MAP.patch b/recipes-containers/criu/files/0001-plugins-cuda-pass-DEBUG_PREFIX_MAP.patch
index 0ccd6989..803c9339 100644
--- a/recipes-containers/criu/files/0001-plugins-cuda-pass-DEBUG_PREFIX_MAP.patch
+++ b/recipes-containers/criu/files/0001-plugins-cuda-pass-DEBUG_PREFIX_MAP.patch
@@ -13,19 +13,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  plugins/cuda/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/plugins/cuda/Makefile b/plugins/cuda/Makefile
-index cc3d98ac9..aac9027a7 100644
---- a/plugins/cuda/Makefile
-+++ b/plugins/cuda/Makefile
+Index: criu-4.2+git/plugins/cuda/Makefile
+===================================================================
+--- criu-4.2+git.orig/plugins/cuda/Makefile
++++ criu-4.2+git/plugins/cuda/Makefile
 @@ -19,7 +19,7 @@ all: $(DEPS_CUDA)
  
  cuda_plugin.so: cuda_plugin.c
         $(call msg-gen, $@)
--       $(Q) $(CC) $(PLUGIN_CFLAGS) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
-+       $(Q) $(CC) $(PLUGIN_CFLAGS) $(DEBUG_PREFIX_MAP) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
+-       $(Q) $(CC) $(PLUGIN_CFLAGS) $(DEFINES) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
++       $(Q) $(CC) $(PLUGIN_CFLAGS) $(DEBUG_PREFIX_MAP) $(DEFINES) $(shell $(COMPEL) includes) $^ -o $@ $(PLUGIN_INCLUDE) $(PLUGIN_LDFLAGS)
  
  clean:
         $(call msg-clean, $@)
--- 
-2.43.0
-