1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
diff --git a/Makefile.config b/Makefile.config
index 6e3e1b062..830a66e83 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -5,9 +5,6 @@ include scripts/feature-tests.mak
ifeq ($(call try-cc,$(FEATURE_TEST_LIBBSD_DEV),-lbsd),true)
LIBS_FEATURES += -lbsd
FEATURE_DEFINES += -DCONFIG_HAS_LIBBSD
-else
- $(info Note: Building without setproctitle() and strlcpy() support.)
- $(info $(info) To enable these features, please install libbsd-devel (RPM) / libbsd-dev (DEB).)
endif
ifeq ($(call pkg-config-check,libselinux),y)
@@ -25,8 +22,6 @@ ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy)
LIBS_FEATURES += -lgnutls
export CONFIG_GNUTLS := y
FEATURE_DEFINES += -DCONFIG_GNUTLS
-else
- $(info Note: Building without GnuTLS support)
endif
ifeq ($(call pkg-config-check,libnftables),y)
@@ -41,9 +36,6 @@ ifeq ($(call pkg-config-check,libnftables),y)
$(warning Warn: you have libnftables installed but it has incompatible API)
$(warning Warn: Building without nftables support)
endif
-else
- $(warning Warn: you have no libnftables installed)
- $(warning Warn: Building without nftables support)
endif
export LIBS += $(LIBS_FEATURES)
diff --git a/lib/Makefile b/lib/Makefile
index 575a7bad3..af88668c5 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -58,8 +58,6 @@ install: lib-c lib-a lib-py crit/crit lib/c/criu.pc.in
$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- $(E) " INSTALL " crit
- $(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
.PHONY: install
uninstall:
diff --git a/scripts/crit-setup.py b/scripts/crit-setup.py
index 871e55921..50745c294 100644
--- a/scripts/crit-setup.py
+++ b/scripts/crit-setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
setup(name="crit",
version="0.0.1",
|
