branches/KDE/4.6/kdebase/workspace

Will Stephenson wstephenson at kde.org
Wed Jan 26 15:25:14 CET 2011


SVN commit 1217284 by wstephens:

Remove MALLOC_CHECK_ from 4.6 branch
CCMAIL: release-team at kde.org
CCMAIL: kde-packager at kde.org


 M  +0 -12     startkde.cmake  


--- branches/KDE/4.6/kdebase/workspace/startkde.cmake #1217283:1217284
@@ -36,18 +36,6 @@
 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
 unset DYLD_FORCE_FLAT_NAMESPACE
 
-# Enable lightweight memory corruption checker if not already set
-# -- this is for trunk only, we remove it for releases
-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
-    # Extract the first two components of the version from the output.
-    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
-
-    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
-    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
-
-    export MALLOC_CHECK_
-fi
-
 # in case we have been started with full pathname spec without being in PATH
 bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
 if [ -n "$bindir" ]; then


More information about the release-team mailing list