[CRIU] [PATCH 2/2] change Makefile in order to pass build under Android NDK

ning.a.zhang at intel.com ning.a.zhang at intel.com
Mon Apr 1 06:18:31 MSK 2019


From: Zhang Ning <ning.a.zhang at intel.com>

1, disable some warning
2, do not hardcode libnl's cflags
3, remove link to rt

Cc: Chen Hu <hu1.chen at intel.com>
Signed-off-by: Zhang Ning <ning.a.zhang at intel.com>
---
 Makefile               | 2 +-
 criu/Makefile          | 2 +-
 criu/Makefile.packages | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 38887da9..2ee46e3a 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ export PROTOUFIX DEFINES
 DEFINES			+= -D_FILE_OFFSET_BITS=64
 DEFINES			+= -D_GNU_SOURCE
 
-WARNINGS		:= -Wall -Wformat-security
+WARNINGS		:= -Wall -Wformat-security -Wno-implicit-function-declaration -Wno-macro-redefined
 
 CFLAGS-GCOV		:= --coverage -fno-exceptions -fno-inline -fprofile-update=atomic
 export CFLAGS-GCOV
diff --git a/criu/Makefile b/criu/Makefile
index bcfb7162..79787817 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -26,7 +26,7 @@ ccflags-y		+= -iquote include
 ccflags-y		+= -iquote images
 ccflags-y		+= -iquote $(ARCH_DIR)/include
 ccflags-y		+= -iquote .
-ccflags-y		+= -I/usr/include/libnl3
+ccflags-y		+= $(shell pkg-config --cflags libnl-3.0)
 ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
 ccflags-y		+= $(CONFIG-DEFINES)
 
diff --git a/criu/Makefile.packages b/criu/Makefile.packages
index d828cb61..b01b4b04 100644
--- a/criu/Makefile.packages
+++ b/criu/Makefile.packages
@@ -32,7 +32,7 @@ REQ-DEB-PKG-NAMES	+= python-future
 REQ-RPM-PKG-TEST-NAMES	+= $(PYTHON)-pyyaml
 endif
 
-export LIBS		+= -lrt -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet
+export LIBS		+= -lprotobuf-c -ldl -lnl-3 -lsoccr -Lsoccr/ -lnet
 
 check-packages-failed:
 	$(warning Can not find some of the required libraries)
-- 
2.20.1



More information about the CRIU mailing list