aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2017-12-16 08:30:53 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-12-16 07:31:48 +0700
commit3c1cbc2705a59893ce8566d4da4219dcb574aba8 (patch)
treea658b20148301ba9b6d5b8507bdaa649841dc5b2
parent8cc7a5d922d2daacdeb1bc67f759826b001b8330 (diff)
network/uTox: Disable ASAN for Release builds
Signed-off-by: Christoph Willing <chris.willing@linux.com>
-rw-r--r--network/uTox/asan_off.diff14
-rw-r--r--network/uTox/uTox.SlackBuild5
2 files changed, 17 insertions, 2 deletions
diff --git a/network/uTox/asan_off.diff b/network/uTox/asan_off.diff
new file mode 100644
index 0000000000000..f6c3ff662aa0a
--- /dev/null
+++ b/network/uTox/asan_off.diff
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig 2017-08-23 06:19:33.000000000 +1000
++++ CMakeLists.txt 2017-12-15 16:07:38.446002260 +1000
+@@ -73,6 +73,11 @@
+ set(ASAN_DEFAULT ON)
+ endif()
+
++# ASAN causes uTox to be slower so do no use it for release builds
++if (CMAKE_BUILD_TYPE MATCHES "Release")
++ set(ASAN_DEFAULT OFF)
++endif()
++
+ ###########
+ # Options #
+ ###########
diff --git a/network/uTox/uTox.SlackBuild b/network/uTox/uTox.SlackBuild
index 927ca78b6c9b6..3554126800106 100644
--- a/network/uTox/uTox.SlackBuild
+++ b/network/uTox/uTox.SlackBuild
@@ -20,7 +20,7 @@
PRGNAM=uTox
VERSION=${VERSION:-0.16.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -58,6 +58,7 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
cd $PRGNAM-$VERSION
+patch -p0 < $CWD/asan_off.diff
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -66,7 +67,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Use GTK2 as default
-[ GTK3=${GTK3:-no} != "yes" ] && patch -p0 < $CWD/gtk2.diff
+[ "${GTK3:-no}" != "yes" ] && patch -p0 < $CWD/gtk2.diff
mkdir -p build
cd build