← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mysql-5.5/saucy-security

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Package Import Robot
  • Author(s): Robie Basak
  • Date: 2013-09-18 10:02:09 UTC
  • Revision ID: package-import@ubuntu.com-20130918100209-qqyyd168q968s8i4
Tags: 5.5.32-0ubuntu7
https://launchpad.net/bugs/1162139
* d/rules, d/control: remove gcc-4.4 dependency and disable X86 assembly in
  taocrypt (LP: #1162139).
  - Cherry-pick from Debian svn r2231 with thanks to Clint Byrum.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
14
14
DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
15
15
 
16
16
ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
17
 
    USE_THIS_GCC_VERSION:=-4.4
 
17
    TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
18
18
endif
19
19
 
20
 
export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
21
 
export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
 
20
export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
 
21
export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
22
22
 
23
23
 
24
24
DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
85
85
        ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
86
86
        sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
87
87
                CC=$${MYSQL_BUILD_CC:-gcc} \
88
 
                CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 
88
                CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -DBIG_JOINS=1 ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
89
89
                CXX=$${MYSQL_BUILD_CXX:-g++} \
90
 
                CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 
90
                CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing ${TAOCRYPT_OPT}"} \
91
91
            cmake -DCMAKE_INSTALL_PREFIX=/usr \
92
92
                \
93
93
                $(FORCE_FPIC) \