From d6f3fb1d7ebddfb2a7ebd1d16dad41e50d3e07e3 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 7 Nov 2016 22:16:58 +0000
Subject: [PATCH 1/2] debug: make valgrind optional, disabled by default, not
 available for armv6

---
 packages/virtual/debug/package.mk | 4 ++--
 projects/RPi/options              | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/virtual/debug/package.mk b/packages/virtual/debug/package.mk
index 1a8619924c..c2ced9e9dc 100644
--- a/packages/virtual/debug/package.mk
+++ b/packages/virtual/debug/package.mk
@@ -38,6 +38,6 @@ if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET vdpauinfo"
 fi
 
-if [ "$DEBUG" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET  valgrind"
+if [ "$DEBUG" = "yes" -a "$VALGRIND" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET valgrind"
 fi
diff --git a/projects/RPi/options b/projects/RPi/options
index 266f8d656d..6570a08f17 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -129,6 +129,10 @@
   # build with installer (yes / no)
     INSTALLER_SUPPORT="no"
 
+  # build debug with valgrind (yes / no)
+  # Not available for armv6. Increases image size significantly
+    VALGRIND="no"
+
   # kernel image name
     KERNEL_NAME="kernel.img"
 

From 64061c6b82291c901be9bf829affabcecf4335a5 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 8 Nov 2016 22:01:03 +0000
Subject: [PATCH 2/2] llvm: don't build with debug, causes insane file size

---
 packages/lang/llvm/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index 46457c92c2..68c68f7bc0 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -60,7 +60,8 @@ makeinstall_host() {
   cp -a bin/llvm-tblgen $ROOT/$TOOLCHAIN/bin
 }
 
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_C_FLAGS="$CFLAGS" \
+PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=MinSizeRel \
+                       -DCMAKE_C_FLAGS="$CFLAGS" \
                        -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
                        -DLLVM_INCLUDE_TOOLS=ON \
                        -DLLVM_BUILD_TOOLS=OFF \