From 360122ed5d417d6bb820bb07fe5f007950a8ad65 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 2 Apr 2015 22:18:05 +0200 Subject: [PATCH] mmc-utils: restore FORTIFY_SOURCE=2 The previous commit ba4338d mmc-utils: don't set -D_FORTIFY_SOURCE in Makefile applied the global value of FORITFY_SOURCE also to mmc-utils. As the package was meant to be built with FORTIFY_SOURCE upstream, restore that behaviour and make it play nice with the global setting by undefining the macro before defining it. Signed-off-by: Daniel Golle --- ....patch => 001-properly-set-fortify-source-in-makefile.patch} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename utils/mmc-utils/patches/{001-dont-set-fortify-source-in-makefile.patch => 001-properly-set-fortify-source-in-makefile.patch} (84%) diff --git a/utils/mmc-utils/patches/001-dont-set-fortify-source-in-makefile.patch b/utils/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch similarity index 84% rename from utils/mmc-utils/patches/001-dont-set-fortify-source-in-makefile.patch rename to utils/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch index 9b2b8ba25f..4a35b959b1 100644 --- a/utils/mmc-utils/patches/001-dont-set-fortify-source-in-makefile.patch +++ b/utils/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch @@ -5,7 +5,7 @@ Index: mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189/Makefile @@ -1,5 +1,5 @@ CC ?= gcc -AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 ++AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 CFLAGS ?= -g -O2 objects = \ mmc.o \ -- 2.30.2