[Pkg-mysql-commits] r1051 - branches/sid-5.0/debian

[Norbert Tretkowski]

Author: nobse
Date: 2007-12-07 07:55:56 +0000 (Fri, 07 Dec 2007)
New Revision: 1051

Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/control
   branches/sid-5.0/debian/rules
Log:
Build with gcc-4.1/g++-4.1.

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-12-06 22:10:23 UTC (rev 1050)
+++ branches/sid-5.0/debian/changelog	2007-12-07 07:55:56 UTC (rev 1051)
@@ -6,6 +6,8 @@
   * Update patches:
     + debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
     + debian/patches/89_ndb__staticlib.dpatch
+  * Build with gcc-4.1/g++-4.1, otherwise the testsuite fails in many
+    testcases.
   * Re-add manpages, they are licensed under GPL now and redistribution is
     permitted.
   * Drop linux-libc-dev build-dependency, it's now being pulled by libc-dev
@@ -20,7 +22,7 @@
   * Add Vcs-* and Homepage fields to source stanza in control file.
   * Update mysqlreport to 3.2 release.
 
- -- Norbert Tretkowski <nobse at debian.org>  Thu, 06 Dec 2007 23:06:05 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 07 Dec 2007 08:54:46 +0100
 
 mysql-dfsg-5.0 (5.0.45-3) unstable; urgency=high
 

Modified: branches/sid-5.0/debian/control
===================================================================
--- branches/sid-5.0/debian/control	2007-12-06 22:10:23 UTC (rev 1050)
+++ branches/sid-5.0/debian/control	2007-12-07 07:55:56 UTC (rev 1051)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders:  Christian Hammers <ch at debian.org>, Sean Finney <seanius at debian.org>, Adam Conrad <adconrad at 0c3.net>, Norbert Tretkowski <nobse at debian.org>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison, gcc-4.1, g++-4.1
 Standards-Version: 3.7.2
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/

Modified: branches/sid-5.0/debian/rules
===================================================================
--- branches/sid-5.0/debian/rules	2007-12-06 22:10:23 UTC (rev 1050)
+++ branches/sid-5.0/debian/rules	2007-12-07 07:55:56 UTC (rev 1051)
@@ -47,9 +47,9 @@
 endif
 
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
-	    	CC=$${MYSQL_BUILD_CC:-gcc} \
+	    	CC=gcc-4.1 \
 	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-DBIG_JOINS=1 -O2"} \
-	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
+	    	CXX=g++-4.1 \
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2"} \
 	    ./configure \
 		--build=${DEB_BUILD_GNU_TYPE} \