diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-05-13 14:07:01 -0400 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-05-19 06:05:54 -0700 |
| commit | 4a631d7876e6de555683939dd87baedb11bcfd6a (patch) | |
| tree | 50b507cfe105bbdcf2b6a37d733400cbfbc0b022 | |
| parent | 764bb0c1e69294a16af22c82a7e788976a0ff797 (diff) | |
configure.ac: enable-debug change breaks _hardened_build
See RHBZ 955283, and http://fedoraproject.org/wiki/Packaging:Guidelines#PIE
The previous change for BZ 851092 in
commit 058a736f9e36238c284ca80e7ed5f62434655019
breaks the ability to enable _hardened_build in release-3.4 and master
wrt test/bugs/bug-884455.t; passes on master/HEAD, passes on my dev box,
passed once with prove -rfvc in run-tests.sh.
BUG: 851092
Change-Id: Ic2afc53bcdf11ede4a543b87aa7c7a3a41ed6f1d
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/4997
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rwxr-xr-x | tests/bugs/bug-884455.t | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index ad6989f8e0d..74075182438 100644 --- a/configure.ac +++ b/configure.ac @@ -524,7 +524,6 @@ AC_SUBST(GF_DISTRIBUTION) GF_HOST_OS="" GF_LDFLAGS="-rdynamic" -CFLAGS="-g" # check for gcc -Werror=format-security saved_CFLAGS=$CFLAGS @@ -600,13 +599,12 @@ AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable debug build options.])) -DEBUG=no +BUILD_DEBUG=no if test "x$enable_debug" = "xyes"; then - DEBUG=yes - CFLAGS="-O0 $CFLAGS" + BUILD_DEBUG=yes + CFLAGS=`echo $CFLAGS | sed -e s/O2/O0/` else - CFLAGS="-O2 $CFLAGS" - DEBUG=no + BUILD_DEBUG=no fi AC_SUBST(CFLAGS) # end enable debug section @@ -668,7 +666,7 @@ echo "fusermount : $BUILD_FUSERMOUNT" echo "readline : $BUILD_READLINE" echo "georeplication : $BUILD_SYNCDAEMON" echo "Linux-AIO : $BUILD_LIBAIO" -echo "Enable Debug : $DEBUG" +echo "Enable Debug : $BUILD_DEBUG" echo "systemtap : $BUILD_SYSTEMTAP" echo "Block Device backend : $BUILD_BD_XLATOR" echo diff --git a/tests/bugs/bug-884455.t b/tests/bugs/bug-884455.t index c193cd8aad6..46e55dad61e 100755 --- a/tests/bugs/bug-884455.t +++ b/tests/bugs/bug-884455.t @@ -66,7 +66,7 @@ TEST ls -l $M0 2>/dev/null; TEST $CLI volume rebalance $V0 start force -EXPECT_WITHIN 15 "0" rebalance_completed +EXPECT_WITHIN 30 "0" rebalance_completed ## check for layout overlaps. EXPECT "0" get_layout $B0/${V0}0 $B0/${V0}1 $B0/${V0}2 |