[Pkg-mysql-commits] r2164 - mysql-5.5/branches/wheezy/debian

[Nicholas Bamber]

tags 674267 pending
thanks

Author: periapt
Date: 2012-06-20 18:44:03 +0000 (Wed, 20 Jun 2012)
New Revision: 2164

Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/control
   mysql-5.5/branches/wheezy/debian/rules
Log:
Setting the gcc/g++ version to 4.4 on i386 platforms (Closes: #674267)
but see #678252 for follow up from upstream

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-06-20 15:33:20 UTC (rev 2163)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-06-20 18:44:03 UTC (rev 2164)
@@ -2,6 +2,8 @@
 
   * Made DFSG repacking mechanism independent of local installs, improved
     the documentation and added debian/README.source
+  * Setting the gcc/g++ version to 4.4 on i386 platforms (Closes: #674267)
+    but see #678252 for follow up from upstream
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sat, 16 Jun 2012 13:53:35 +0100
 

Modified: mysql-5.5/branches/wheezy/debian/control
===================================================================
--- mysql-5.5/branches/wheezy/debian/control	2012-06-20 15:33:20 UTC (rev 2163)
+++ mysql-5.5/branches/wheezy/debian/control	2012-06-20 18:44:03 UTC (rev 2164)
@@ -4,7 +4,7 @@
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>,
  Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>
-Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake
+Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386]
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Modified: mysql-5.5/branches/wheezy/debian/rules
===================================================================
--- mysql-5.5/branches/wheezy/debian/rules	2012-06-20 15:33:20 UTC (rev 2163)
+++ mysql-5.5/branches/wheezy/debian/rules	2012-06-20 18:44:03 UTC (rev 2164)
@@ -13,9 +13,13 @@
 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
-export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
+ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
+    USE_THIS_GCC_VERSION:=-4.4
+endif
 
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
+
 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-)