[CRIU] [PATCH 2/2 v2] Fix Fedora build (undo _FORTIFY_SOURCE for pie)
Kir Kolyshkin
kir at openvz.org
Thu Feb 16 17:47:28 PST 2017
Recent Fedora releases add -Wp,-D_FORTIFY_SOURCE=2 to rpm builds,
which breaks compiling pie code on some architectures due to its
trying to use (absent) memcpy_chk() instead of usual memcpy().
We must stand strong against FORTIFY_SOURCE in pie code.
No pasaran! Viva la resistance!
NOTE: in tests, FORTIFY_SOURCE is disabled for completely different
reasons (see commit d1a36cc9 for details), so we're not touching it.
[v2: resend the correct (latest) version]
Reported-by: Reported-by: Adrian Reber <adrian at lisas.de>
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
criu/pie/Makefile | 1 +
criu/pie/Makefile.library | 1 +
2 files changed, 2 insertions(+)
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 8d593e2..141c018 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -22,6 +22,7 @@ CFLAGS += -iquote $(SRC_DIR)/criu/include
CFLAGS += -iquote $(SRC_DIR)/include
CFLAGS += -iquote $(SRC_DIR)
CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+CFLAGS += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
ifneq ($(filter-out ia32,$(ARCH)),)
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index 7d6d859..dce650a 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -50,3 +50,4 @@ else
endif
ccflags-y += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+ccflags-y += -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
--
2.9.3
More information about the CRIU
mailing list