From: Bjorn Munch
Date: May 25 2011 10:39am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3219) Bug#12586211
List-Archive: http://lists.mysql.com/commits/138063
X-Bug: 12586211
Message-Id: <201105251039.p4PAdUwf004323@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0173404232=="

--===============0173404232==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/gzcore-55/ based on revid:bjorn.munch@stripped

 3219 Bjorn Munch	2011-05-25
      Bug #12586211 ENABLE GCOV BUILDS WITH CMAKE, INCLUDING PLUGINS
      Added --with-gcov option to configure.pl and use that from SETUP.sh

    modified:
      BUILD/SETUP.sh
      cmake/configure.pl
=== modified file 'BUILD/SETUP.sh'
--- a/BUILD/SETUP.sh	2011-05-06 09:20:01 +0000
+++ b/BUILD/SETUP.sh	2011-05-25 10:39:11 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2000, 2007 MySQL AB
+# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -250,7 +250,7 @@ gcov_compile_flags="$gcov_compile_flags
 
 gcov_link_flags="-fprofile-arcs -ftest-coverage"
 
-gcov_configs="--disable-shared"
+gcov_configs="--with-gcov"
 
 # gprof
 

=== modified file 'cmake/configure.pl'
--- a/cmake/configure.pl	2010-11-12 01:33:19 +0000
+++ b/cmake/configure.pl	2011-05-25 10:39:11 +0000
@@ -190,6 +190,11 @@ foreach my $option (@ARGV)
     $cmakeargs = $cmakeargs." \"-DWITH_COMMENT=".substr($option,13)."\""; 
     next;
   }
+  if ($option =~ /with-gcov/)
+  {
+      $cmakeargs = $cmakeargs." -DENABLE_GCOV=ON"; 
+      next;
+  }
 
   $option = uc($option);
   $option =~ s/-/_/g;


--===============0173404232==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/gzcore-55/
# testament_sha1: f3cdd585656617e8d46d71909e056b08b21c67fd
# timestamp: 2011-05-25 12:39:30 +0200
# base_revision_id: bjorn.munch@stripped\
#   9lwj8xnzxwhwelhj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQHFJ4EAAjjfgFAQXGf//37v
z4C////7UATunvDpvM9QOe926vXrwlERMTFTzJPQxMRop6YiM0yaBHqeoaNGIGkDSjTMmptJ5U8o
NAA0AAAAAAlCNETaJkE9CI2p6g09QaeoAAANG1AYqelNlBlGno0xTIyeoA0AAMgABoJJJpoKn4mk
xqn4mTUmj9FD1PUaANGQAAL6OEklJ7wX28ne876IfeKfmroDrqyOrhQTyZM9frbcsccVsUgkQDEd
9d74uZqjozi6EEkj6+JEHQnqapCZUbTmQWB9rzjJ/SLL9N2m72RvLu87YfP46VKPP3otr/lw9WMI
VSFQu33nx/Dr1XX7IaHG5M5O/oE4uMEOe91LtVN2jVFmjuY5EJTBYhNADNSXRSK/CosT9hjLy847
aaqHaa0KoEwfE/JtzD2yLqK9l3PAEhcy84KKHUzCJGEBoKavWyCFcjzSNdJJFK0xlmVLQklx1HCd
TvbxRQMAIuqAtIYQwccB2RExL+F9VALRgRkWfM1ZVXykhys6WhkjjbEuhLMYHxNAKclzbg36i4me
DZdpRi8c08hlpuxCZ9mmVNgcgyL0yALozdM9IcUYRB8ZIQ2uvUZ4oSgbs6RKnVWgirYzJYjMmlGL
FTbEso19oGk2RL2nPQA9VVLEFFgtyZo2c18SWALim4yDENn9At7dGipOYDCiIsjSMYDK7Hba+Y06
ptKnZOGEpMjBQX1k1iApqWUh+Oi9bcD2mgphIi96VQFVzuem+Qs1BXWAzLig62YA/YxFhGgGSSlB
RGMJg2KqW7AFkjimySuNUBkRhY6qcmqweZTgsCvYb0xM+hHQ0TY02QBYWxvZnWxUdgWSxSaE5q23
Vm6UXdkflGXeUjFReD0HyJpntQJtP3eghGCiqv3G9ecebwFp/voekLv69w9ceNXWsJ2ccvXvOv3r
Vx0Ek+bj0Fy2t2J1GBS8oTfxy24VUTPU0NYwNgpmOzUf57aeHkIkTw+dEnwuIa5FTvlI3XjujRIx
+RYF3cUvDSfuJSAO3tN5dGJ3cU603mhFGe31mb4G/tA5OmgzJbjNA+7J4kI2KaAtESqNVETB7Eoi
P8LXcK8/EK1K0jxVNbZTqs8uap4LgK1BzDi4XzSdFyjka0afEyxfl92ZMDPt0uIIoKcqNkzGtLr+
TAdJBTkX5qxpChivGwxmOOvqy2bJlwbDFLLQsHqwrSlI0UL09uGTdMWUmJNAiRkuHNKiSQlZVjGr
VSBOOsbXeXGwtjU+cH0r/EUDSjpMDWPflEcWrdwz8imzKMGRQaB2HbTEW451MUMRa+UQWBbGI7Jw
SDIdIF4gAKZYKWPMQQ2TiMRIZEETAyZCrhldFbRAhEhYVGnWNExE01IuRw20gmjISo/OhYT2xqma
sI0HGBFQZo1FQRBkMtgxS5atfGLeAzgmgrFKZi8Ww64KnuceMA6I7EGGBMGJVKwJiNE8f3ZEVOU3
PrFGMGblyWccN8TNeJMZPBEQw5tTNz3yDaIfaNZBrcZslx4FA4cNZ2K9zDA9T0AbgbkBPCNTJstq
u9TxBm0oQSpm7zJAr6N8fLWAUx1zwhpAyTVU7USDKuXoGjnd8G7hrxB8TFJeB0IcQJ1vb0dxry2k
7QnAcby22G97xwLIpqZeBKwkqna8XDKc6SDiFEMKgFVhAxbaJOzZLfTVBbDRuCrmw8oFSrbjqkWy
wDhYjovrLE9MXLBTHPUmnCA8P70UTpSRLEz5c1VoF2ucpSKhKzj/xdyRThQkAHFJ4EA=


--===============0173404232==--