Setting the gcc/g++ version to 4.5 on i386 platforms (cf. #674267)

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2155 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

5 files changed, 9 insertions, 103 deletions

diff --git a/debian/changelog b/debian/changelog
index a632e79..3056587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,7 @@ mysql-5.5 (5.5.25+dfsg-1) UNRELEASED; urgency=low
 
   * Fixing regular expression in tests to guard against build path containing
     the '+' symbol (Closes: #674210)
-  * Skipped certain SSL tests on i386 type architectures
-    pending investigation (cf. #674267)
+  * Setting the gcc/g++ version to 4.5 on i386 platforms (cf. #674267)
   * 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
diff --git a/debian/control b/debian/control
index 3b6aa12..5362f19 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint@lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert@tretkowski.de>,
  Clint Byrum <clint@ubuntu.com>, Nicholas Bamber <nicholas@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
+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]
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
diff --git a/debian/patches/linked_list_mem_failure.patch b/debian/patches/linked_list_mem_failure.patch
deleted file mode 100644
index a8bbc22..0000000
--- a/debian/patches/linked_list_mem_failure.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Subject: certain tests failing
-Bug-Debian: http://bugs.debian.org/674267
-Last-Update: 2012-05-27
-Forwarded: not-needed
---- /dev/null
-+++ b/mysql-test/include/debian-fail-674267.inc
-@@ -0,0 +1,5 @@
-+if (`select @@version_compile_machine regexp 'i[3456]86' = 1`)
-+{
-+  skip See Debian bug #674267;
-+}
-+
---- a/mysql-test/t/ssl_connect.test
-+++ b/mysql-test/t/ssl_connect.test
-@@ -1,4 +1,5 @@
- 
-+-- source include/debian-fail-674267.inc
- -- source include/have_ssl_communication.inc
- 
- # Repeat connect/disconnect
---- a/mysql-test/t/ssl_cipher.test
-+++ b/mysql-test/t/ssl_cipher.test
-@@ -1,5 +1,6 @@
- # Turn on ssl between the client and server
- # and run a number of tests
-+-- source include/debian-fail-674267.inc
- 
- --echo #
- --echo # BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
---- a/mysql-test/suite/rpl/t/rpl_ssl.test
-+++ b/mysql-test/suite/rpl/t/rpl_ssl.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-674267.inc
- source include/have_ssl_communication.inc;
- source include/master-slave.inc;
- 
---- a/mysql-test/suite/rpl/t/rpl_ssl1.test
-+++ b/mysql-test/suite/rpl/t/rpl_ssl1.test
-@@ -1,3 +1,5 @@
-+
-+-- source include/debian-fail-674267.inc
- source include/have_ssl_communication.inc;
- source include/master-slave.inc;
- 
---- a/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
-+++ b/mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
-@@ -3,6 +3,7 @@
- # Date:   02/19/2009
- # Purpose: Testing basic functionality of heartbeat over SSL
- #############################################################
-+-- source include/debian-fail-674267.inc
- --source include/have_ssl_communication.inc
- --source include/master-slave.inc
- --echo
---- a/mysql-test/t/openssl_1.test
-+++ b/mysql-test/t/openssl_1.test
-@@ -1,6 +1,7 @@
- # Tests for SSL connections, only run if mysqld is compiled
- # with support for SSL.
- 
-+-- source include/debian-fail-674267.inc
- -- source include/have_ssl_communication.inc
- 
- # Save the initial number of concurrent sessions
---- a/mysql-test/t/ssl.test
-+++ b/mysql-test/t/ssl.test
-@@ -1,6 +1,7 @@
- # Turn on ssl between the client and server
- # and run a number of tests
- 
-+-- source include/debian-fail-674267.inc
- -- source include/have_ssl_communication.inc
- 
- # Save the initial number of concurrent sessions
---- a/mysql-test/t/ssl_compress.test
-+++ b/mysql-test/t/ssl_compress.test
-@@ -1,6 +1,7 @@
- # Turn on compression between the client and server
- # and run a number of tests
- 
-+-- source include/debian-fail-674267.inc
- -- source include/have_ssl_communication.inc
- -- source include/have_compress.inc
- 
---- a/mysql-test/t/ssl_8k_key.test
-+++ b/mysql-test/t/ssl_8k_key.test
-@@ -2,6 +2,7 @@
- #
- # Bug#29784 YaSSL assertion failure when reading 8k key.
- #
-+-- source include/debian-fail-674267.inc
- --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
- 
- ##  This test file is for testing encrypted communication only, not other
diff --git a/debian/patches/series b/debian/patches/series
index ac2d096..54cb022 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,5 @@ spelling.patch
 fix-mysqldump-test.patch
 hyphens-in-manpages.patch
 regex_plus.patch
-linked_list_mem_failure.patch
 kfreebsd_fails.patch
 versioned_symbols.patch
diff --git a/debian/rules b/debian/rules
index f44d38a..fd2fff3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,12 @@ DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 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))
+    USE_THIS_GCC_VERSION:=-4.5
+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 ' ')
@@ -60,7 +64,7 @@ ifneq (,$(findstring linux-gnu,$(DEB_HOST_GNU_TYPE)))
     USE_LINUX_NATIVE_AIO:=-DLINUX_NATIVE_AIO=ON
 endif
 
-override_dh_auto_clean: 
+override_dh_auto_clean:
 	@echo "RULES.$@"
 	dh_testdir 
 	dh_testroot