LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3404 Commits
1 Branch
46 MiB
Tree: 93b1d74c76
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '93b1d74c76'
${ noResults }
openwrt-packages-dist/utils/mmc-utils/patches/001-properly-set-fortify-so...

11 lines
466 B
Raw Normal View History

mmc-utils: don't set -D_FORTIFY_SOURCE in Makefile Now that security features are set globally, having the FORTIFY_SOURCE option set in Makefile breaks the build when CONFIG_PKG_FORTIFY_SOURCE_{1,2} is enabled as well. arm-openwrt-linux-uclibcgnueabi-gcc -Wall -Werror -Wuninitialized -Wundef -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -Os -pipe -march=armv6k -mtune=mpcore -fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable -mfloat-abi=soft -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -Wp,-MMD,./.mmc.o.d,-MT,mmc.o -c mmc.c -o mmc.o <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] <command-line>:0:0: note: this is the location of the previous definition cc1: all warnings being treated as errors Makefile:35: recipe for target 'mmc.o' failed Fix this by removing -D_FORTIFY_SOURCE=2 from Makefile. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Michael Heimpold <mhei@heimpold.de>
10 years ago
​
​
​
​
​
​
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>
10 years ago
mmc-utils: don't set -D_FORTIFY_SOURCE in Makefile Now that security features are set globally, having the FORTIFY_SOURCE option set in Makefile breaks the build when CONFIG_PKG_FORTIFY_SOURCE_{1,2} is enabled as well. arm-openwrt-linux-uclibcgnueabi-gcc -Wall -Werror -Wuninitialized -Wundef -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -Os -pipe -march=armv6k -mtune=mpcore -fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable -mfloat-abi=soft -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -Wp,-MMD,./.mmc.o.d,-MT,mmc.o -c mmc.c -o mmc.o <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] <command-line>:0:0: note: this is the location of the previous definition cc1: all warnings being treated as errors Makefile:35: recipe for target 'mmc.o' failed Fix this by removing -D_FORTIFY_SOURCE=2 from Makefile. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Michael Heimpold <mhei@heimpold.de>
10 years ago
​
​
 
  1. Index: mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189/Makefile

  2. ===================================================================

  3. --- mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189.orig/Makefile

  4. +++ mmc-utils-f4eb241519f8d500ce6068a70d2389be39ac5189/Makefile

  5. @@ -1,5 +1,5 @@

  6.  CC ?= gcc
  7. -AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2

  8. +AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2

  9.  CFLAGS ?= -g -O2
  10.  objects = \
  11.  	mmc.o \