From: Bjorn Munch
Date: May 24 2011 1:31pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3218) Bug#12586211
List-Archive: http://lists.mysql.com/commits/137992
X-Bug: 12586211
Message-Id: <201105241331.p4ODVV0A003401@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1336614564=="

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

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

 3218 Bjorn Munch	2011-05-24
      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-24 13:30:33 +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-24 13:30:33 +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;


--===============1336614564==
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/gccm-55/
# testament_sha1: 1464fa103e7914e0761d1cd4a8fee1b63297a388
# timestamp: 2011-05-24 15:31:31 +0200
# base_revision_id: bjorn.munch@stripped\
#   1nl5w32ovvw8qlfs
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRxLCgkAAkTfgFAQXGf//37v
z4C////7UATh7k0cuuUoujus7hKISbUxNGiYyBkAKNNqaegjyTINMjyIMopmmqeninoyajUaHqNN
A0GgAAAABkIQ1R4o8iZMgekHqaAAA0ADTQHNMjIZMENGEwRpo0YgaZMjAAEEkiZGgEZT0NRpoyKM
Yp6aaelGCepkNBkWkcTTYT2r2m/iC4d9F72knu44A3YooFuoJxZchlxtrZHOVslgsKDUOObj6SeF
Ce/3JhRVVU/fkg9z71DaVLiz6XNUWu9sLmUeslXhv1RfSxCu/zzR+enUpg8/bBmyf2scmMI1SNQi
tQvH3tuyJ9MeBzcSTw6BPFzBDXLuXrVN+fW+qStftHSipbMNwlHXRFbOW06wMlD1HPLu8R3MYydo
0IVoJg/Y/ssrD54COcj8wuU2OALOL2ULYAggoGVlBMGYKyDB2VgBryAGQYZA+EuWiUsaDGmuJcBA
0CYStSn4cwDtIDQZnaXXTEzJLUX+F+F8tIwK9NJqSVMsyMSR3ufTvneWuxAj4nOeZqBjXc7prDsp
LzFSO3myS2xwudJaFMmMChMMMUkqtgco1Uuq1QR1YmSi4OJOV1M6RAjJO01ajHGCKLIDuqrkFGqD
M56AZm0JynAumQPVicje8rt0aCyBtlnRRuA0AT020WMmBhDSc7EmfXuxI4A21YdRWPLc9VUlZtqm
HpHO+4JMnHSlMoRiugXtAJFi6W/oArYXsC+0tYbzEsCKmJlXStmChBUElM6moqGrf6b9rcYuGd7g
FZKgvLZUHmCBOrbXqIxCp1ew21kTenxaUSoUw02RZjSU2UVlkjUMZuiepAZoLRFgEvudpxWCKhco
CQRxkIhIi696riTdNMOcc3pNI5k3lPLuMcZ/SC8D63SqHDDM3zH+veTt7hdv+9T1jg9OBBXdzfyV
sMfOzy2nLir+fQVk8oCCQWzYZjheTElokIYOFWa8qiZ8bQ17RofAU15zYm33r7z7cREl8CRhfBHZ
gy/TErhOca0qyjS0m8f1Vo85fI0HjSHHiXyMYd6dadppRRnPxutzHZ2gfiqsaC2nCcvaCJmkkGeH
CewaBEpoAtMURJb/MvCJe+uiDAtkKVKUlnstbRh2T4UxCeIOfMjK/Ly9R+BDX5noTzgXVfv3QxWD
vN6F2gxTVPDgvqzaSdB8SLPiX5KxpXQntGsoKOi51XKqum6uXYTttvXHyYYkkRQlonsVLubVDiK9
YahkTXM9CF90rH6pZlwmAuF9+Z6LEnuPcSofMxkw51TTYuhLbdmpnUkWssYFQsLx2dbPtAYI5NyJ
jNP70yE8T+gu22lwoGdjkSr3yEKwsKhEiSCZxPEhmeVtc1AgRAjMabni5Qx9AGsCjmgeHKC4RNK7
awM0dBn13Mt+4LUblB4W8x1AcL2GQmJmJLrdo7tu/gWaxKrkTuh6xUSkmqNs80y9YL/owoYYEwdB
ZQwJiCKYfVkPsxW+nhfBgEAtU2ufhVmuEl5O8pDDnqydF0gxIicRBxMlzLHIG5KDrx6EzTUqKDkj
pCWvA5HpvRlWFMHc4QNUwECZ47SlhNbjdwRAAz7+CTRaaCIbGDKiUWhXVvfMr39ZnkEz2LDghiBS
vxbjvbWZVlIuzWZX4AR4wgODDF1sNgZYpz9XTcbDdHZWi1FOmTwfeMUAVd7YncGGXprgGwPxAYIY
2l6M0FGzasIy2rKy4RPIAMhmL0cRGXswgOIESymFM2LJRDIXUr3zx/4u5IpwoSA4lhQS


--===============1336614564==--