aboutsummaryrefslogtreecommitdiff
path: root/utils/mmc-utils
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2015-04-02 22:18:05 +0200
committerMichael Heimpold <mhei@heimpold.de>2015-04-03 22:17:07 +0200
commit360122ed5d417d6bb820bb07fe5f007950a8ad65 (patch)
tree96ba46c06971ea4a90507d4e609bee609d5bf7a9 /utils/mmc-utils
parent822c18cb8768a3448109909304623b4136944d7f (diff)
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 <daniel@makrotopia.org>
Diffstat (limited to 'utils/mmc-utils')
-rw-r--r--utils/mmc-utils/patches/001-properly-set-fortify-source-in-makefile.patch (renamed from utils/mmc-utils/patches/001-dont-set-fortify-source-in-makefile.patch)2
1 files changed, 1 insertions, 1 deletions
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
index 9b2b8ba25..4a35b959b 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 \