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

[Clint Byrum]

tags 678252 pending
tags 707280 pending
thanks

Author: spamaps-guest
Date: 2013-05-11 00:15:52 +0000 (Sat, 11 May 2013)
New Revision: 2231

Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/control
   mysql-5.5/branches/unstable/debian/rules
Log:
d/rules, d/control: Remove gcc-4.4 dependency and disable X86
assembly in taocrypt. (Closes: #707280) (Closes: #678252)

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2013-05-10 13:54:08 UTC (rev 2230)
+++ mysql-5.5/branches/unstable/debian/changelog	2013-05-11 00:15:52 UTC (rev 2231)
@@ -1,3 +1,10 @@
+mysql-5.5 (5.5.31+dfsg-2) UNRELEASED; urgency=low
+
+  * d/rules, d/control: Remove gcc-4.4 dependency and disable X86
+    assembly in taocrypt. (Closes: #707280) (Closes: #678252)
+
+ -- Clint Byrum <clint at ubuntu.com>  Wed, 08 May 2013 13:11:27 -0700
+
 mysql-5.5 (5.5.31+dfsg-1) unstable; urgency=high
 
   * New upstream release.

Modified: mysql-5.5/branches/unstable/debian/control
===================================================================
--- mysql-5.5/branches/unstable/debian/control	2013-05-10 13:54:08 UTC (rev 2230)
+++ mysql-5.5/branches/unstable/debian/control	2013-05-11 00:15:52 UTC (rev 2231)
@@ -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, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [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, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake
 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	2013-05-10 13:54:08 UTC (rev 2230)
+++ mysql-5.5/branches/unstable/debian/rules	2013-05-11 00:15:52 UTC (rev 2231)
@@ -14,11 +14,11 @@
 DEBVERSION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
 ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
-    USE_THIS_GCC_VERSION:=-4.4
+    TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
 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)
+export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
+export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
 
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
@@ -90,9 +90,9 @@
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
-		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
+		CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    	CXX=$${MYSQL_BUILD_CXX:-g++} \
-	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
+	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
 	    cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_VERBOSE_MAKEFILE=ON \
 		$(FORCE_FPIC) \