From 93dafc9031232ca764d815e496f9f6949e7a3095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 13 Sep 2017 00:14:55 +0300
Subject: [PATCH] Remove CMake cache before reconfiguring

By removing the cache file, the packages of the non-core components are
generate properly.
---
 BUILD/build_deb_local.sh | 15 ++++++++-------
 BUILD/build_rpm_local.sh |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/BUILD/build_deb_local.sh b/BUILD/build_deb_local.sh
index 48f44180f..2b711e182 100755
--- a/BUILD/build_deb_local.sh
+++ b/BUILD/build_deb_local.sh
@@ -44,16 +44,17 @@ if [ "$build_experimental" == "yes" ]
 then
     for component in experimental devel client
     do
-	    cd _build
-	    export LD_LIBRARY_PATH=""
-	    cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
-	    export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
-	    make package
-	    cp _CPack_Packages/Linux/DEB/*.deb ../
+        cd _build
+        rm CMakeCache.txt
+        export LD_LIBRARY_PATH=""
+        cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
+        export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
+        make package
+        cp _CPack_Packages/Linux/DEB/*.deb ../
         cd ..
         cp _build/*.deb .
         cp *.deb ..
-	    cp _build/*.gz .
+        cp _build/*.gz .
     done
 fi
 
diff --git a/BUILD/build_rpm_local.sh b/BUILD/build_rpm_local.sh
index aeed976b8..58ad6111a 100755
--- a/BUILD/build_rpm_local.sh
+++ b/BUILD/build_rpm_local.sh
@@ -40,6 +40,7 @@ then
     for component in experimental devel client
     do
         cd _build
+        rm CMakeCache.txt
         cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
         sudo make package
         cd ..