[Pkg-mysql-commits] r2165 - mysql-5.5/branches/unstable/debian

[Nicholas Bamber]

tags 674267 pending
thanks

Author: periapt
Date: 2012-06-20 18:52:05 +0000 (Wed, 20 Jun 2012)
New Revision: 2165

Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/control
   mysql-5.5/branches/unstable/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/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2012-06-20 18:44:03 UTC (rev 2164)
+++ mysql-5.5/branches/unstable/debian/changelog	2012-06-20 18:52:05 UTC (rev 2165)
@@ -2,7 +2,8 @@
 
   * Fixing regular expression in tests to guard against build path containing
     the '+' symbol (Closes: #674210)
-  * Setting the gcc/g++ version to 4.5 on i386 platforms (cf. #674267)
+  * Setting the gcc/g++ version to 4.4 on i386 platforms (Closes: #674267)
+    but see #678252 for follow up from upstream
   * Removed main_openssl_1 patch
   * Set SYSTEM_TYPE according to GNU Build System
   * In an effort to get a better handle on test coverage, made test failures

Modified: mysql-5.5/branches/unstable/debian/control
===================================================================
--- mysql-5.5/branches/unstable/debian/control	2012-06-20 18:44:03 UTC (rev 2164)
+++ mysql-5.5/branches/unstable/debian/control	2012-06-20 18:52:05 UTC (rev 2165)
@@ -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), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.5 [any-i386], g++-4.5 [any-i386]
+Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, 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/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules	2012-06-20 18:44:03 UTC (rev 2164)
+++ mysql-5.5/branches/unstable/debian/rules	2012-06-20 18:52:05 UTC (rev 2165)
@@ -14,8 +14,8 @@
 DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
-ifneq (,$(filter $(ARCH), i386 kfreebsd-i386))
-    USE_THIS_GCC_VERSION:=-4.5
+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)