From 025d1e77c81a77869f527bed018eb6701a6d419e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 15 Mar 2010 00:14:46 -0400 Subject: [PATCH] debian: static build no longer needs -fno-stack-protector From: Kees Cook I noticed that the debian/rules contains "-fno-stack-protector". While this used to be needed a while back, this is no longer required, as the stack protection code will be statically compiled into the static e2fsprogs correctly now. Addresses-Debian-Bug: #573923 Signed-off-by: "Theodore Ts'o" --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 1c7ea40e5..6cf47a1b5 100755 --- a/debian/rules +++ b/debian/rules @@ -227,17 +227,17 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) if type diet > /dev/null 2>&1 ; then \ cd ${staticbuilddir} && AWK=/usr/bin/awk \ ${topdir}/configure ${STATIC_CONF_FLAGS} \ - --with-diet-libc CFLAGS="${CFLAGS} -fno-stack-protector"; \ + --with-diet-libc CFLAGS="${CFLAGS}"; \ else \ cd ${staticbuilddir} && AWK=/usr/bin/awk \ ${topdir}/configure ${STATIC_CONF_FLAGS} \ - CFLAGS="${CFLAGS} -fno-stack-protector"; \ + CFLAGS="${CFLAGS}"; \ fi else cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ - CFLAGS="${CFLAGS} -fno-stack-protector" + CFLAGS="${CFLAGS}" endif mkdir -p ${STAMPSDIR} touch ${CFGSTATICSTAMP} -- 2.47.2