Takashi Iwai
babf377fa1
New features:
* Shadow stack support
* CUDA plugin: Introduced a plugin to support checkpointing and restoring
NVIDIA CUDA applications.
Bugfixes:
* cgroup: Add support for restoring a thread in a correct v1 cgroup
* mem: fix some VMAs being incorrectly mapped wtih PROT_WRITE
* criu: fix a fatal failure if nft doesn't work
* net: Fix TOCTOU race condition in unix_conf_op
* pagemap-cache: handle short reads
* Fixes here and there.
Improvements:
* Pagemap cache: Added support for PAGEMAP_SCAN ioctl
* zdtm: Added tests for IP_TTL restore
* irmap: hardcode some more interesting paths
* util: use close_range when it's supported
* Fixes and improvements in amdgpu-plugin
- Make criu-plugin-cuda subpackage
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=121
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 95191250537d1cd872668647da76234241f16661 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Tue, 1 Dec 2020 16:32:19 +0100
|
|
Subject: [PATCH] Fix build with nftables installed in different directory
|
|
|
|
The cflags needs to be passed to the build test.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
Makefile.config | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- a/Makefile.config
|
|
+++ b/Makefile.config
|
|
@@ -42,13 +42,16 @@ else
|
|
endif
|
|
|
|
ifeq ($(call pkg-config-check,libnftables),y)
|
|
+ CFLAGS_NFTABLES := $(shell $(PKG_CONFIG) --cflags libnftables)
|
|
LIB_NFTABLES := $(shell $(PKG_CONFIG) --libs libnftables)
|
|
- ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
|
|
+ ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(CFLAGS_NFTABLES) $(LIB_NFTABLES)),true)
|
|
LIBS_FEATURES += $(LIB_NFTABLES)
|
|
FEATURE_DEFINES += -DCONFIG_HAS_NFTABLES_LIB_API_0
|
|
- else ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_1),$(LIB_NFTABLES)),true)
|
|
+ FEATURE_CFLAGS += $(CFLAGS_NFTABLES)
|
|
+ else ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_1),$(CFLAGS_NFTABLES) $(LIB_NFTABLES)),true)
|
|
LIBS_FEATURES += $(LIB_NFTABLES)
|
|
FEATURE_DEFINES += -DCONFIG_HAS_NFTABLES_LIB_API_1
|
|
+ FEATURE_CFLAGS += $(CFLAGS_NFTABLES)
|
|
else
|
|
$(info Warn: Building without nftables support (incompatible API version).)
|
|
endif
|
|
@@ -78,7 +81,7 @@ endif
|
|
endif
|
|
|
|
export DEFINES += $(FEATURE_DEFINES)
|
|
-export CFLAGS += $(FEATURE_DEFINES)
|
|
+export CFLAGS += $(FEATURE_DEFINES) $(FEATURE_CFLAGS)
|
|
|
|
FEATURES_LIST := TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
|
|
SETPROCTITLE_INIT TCP_REPAIR_WINDOW MEMFD_CREATE \
|