[Pkg-mysql-commits] r2016 - mysql-5.5/branches/experimental/debian

[Clint Byrum]

Author: spamaps-guest
Date: 2011-11-09 22:43:43 +0000 (Wed, 09 Nov 2011)
New Revision: 2016

Modified:
   mysql-5.5/branches/experimental/debian/changelog
   mysql-5.5/branches/experimental/debian/control
   mysql-5.5/branches/experimental/debian/rules
Log:
d/rules, d/control: Build with gcc 4.5 to avoid
gcc 4.6 compile problems (see Debian bug number 630471)

Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog	2011-11-08 22:59:47 UTC (rev 2015)
+++ mysql-5.5/branches/experimental/debian/changelog	2011-11-09 22:43:43 UTC (rev 2016)
@@ -1,3 +1,10 @@
+mysql-5.5 (5.5.17-2) UNRELEASED; urgency=low
+
+  * d/rules, d/control: Build with gcc 4.5 to avoid
+    gcc 4.6 compile problems (see Debian bug number 630471)
+
+ -- Clint Byrum <clint at ubuntu.com>  Wed, 09 Nov 2011 14:43:10 -0800
+
 mysql-5.5 (5.5.17-1) experimental; urgency=low
 
   [Norbert Tretkowski]

Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control	2011-11-08 22:59:47 UTC (rev 2015)
+++ mysql-5.5/branches/experimental/debian/control	2011-11-09 22:43:43 UTC (rev 2016)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.4.20ubuntu6), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 7.4.20ubuntu6), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.5, g++-4.5
 Standards-Version: 3.9.2
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules	2011-11-08 22:59:47 UTC (rev 2015)
+++ mysql-5.5/branches/experimental/debian/rules	2011-11-09 22:43:43 UTC (rev 2016)
@@ -13,6 +13,9 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc-4.5
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++-4.5
+
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)