Commit 7ac0f474 authored by Dirk Eddelbuettel's avatar Dirk Eddelbuettel

Import Debian changes 3.2.3-2

r-base (3.2.3-2) unstable; urgency=low

  [ Sébastien Villemot ]
  * Use gcc-4.9 to compile C code on mips, as a workaround to a gcc-5 bug.
    (Closes: #810357).
  * Enable back optimization flags on mips and mipsel.

  [ Dirk Eddelbuettel ]
  * debian/control: Use Sebastien's patch and add gcc-4.9 for mips
  * debian/rules: Use Sebastien's patch and enforce gcc-4.9 for mips, also
    comment-out remaining suppression of optmization

r-base (3.2.3-1.wily.0) wily; urgency=low

  * PPA build for Ubuntu 15.10 ("wily")
parent 78572ece
r-base (3.2.3-2) unstable; urgency=low
[ Sébastien Villemot ]
* Use gcc-4.9 to compile C code on mips, as a workaround to a gcc-5 bug.
(Closes: #810357).
* Enable back optimization flags on mips and mipsel.
[ Dirk Eddelbuettel ]
* debian/control: Use Sebastien's patch and add gcc-4.9 for mips
* debian/rules: Use Sebastien's patch and enforce gcc-4.9 for mips, also
comment-out remaining suppression of optmization
-- Dirk Eddelbuettel <edd@debian.org> Sun, 10 Jan 2016 21:22:03 -0600
r-base (3.2.3-1.wily.0) wily; urgency=low
* PPA build for Ubuntu 15.10 ("wily")
-- Dirk Eddelbuettel <edd@debian.org> Mon, 14 Dec 2015 13:08:31 -0600
r-base (3.2.3-1) unstable; urgency=low
* New upstream version released this morning
......
......@@ -3,7 +3,7 @@ Section: gnu-r
Priority: optional
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Standards-Version: 3.9.6
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.6-dev, tk8.6-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, libcurl4-openssl-dev | libcurl4-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff5-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], mpack, bash-completion
Build-Depends: gcc (>= 4:4.1.0), g++ (>= 4:4.1.0), gfortran (>= 4:4.1.0), libblas-dev, liblapack-dev (>= 3.1.1), tcl8.6-dev, tk8.6-dev, bison, groff-base, libncurses5-dev, libreadline-dev, debhelper (>= 7.2.3), texinfo (>= 4.1-2), libbz2-dev, liblzma-dev, libpcre3-dev, libcurl4-openssl-dev | libcurl4-dev, xdg-utils, zlib1g-dev, libpng-dev, libjpeg-dev, libx11-dev, libxt-dev, x11proto-core-dev, libpango1.0-dev, libcairo2-dev, libtiff5-dev, xvfb, xauth, xfonts-base, texlive-base, texlive-latex-base, texlive-generic-recommended, texlive-fonts-recommended, texlive-fonts-extra, texlive-extra-utils, texlive-latex-recommended, texlive-latex-extra, default-jdk [!arm !hppa !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], mpack, bash-completion, gcc-4.9 [mips]
Homepage: http://www.r-project.org/
Package: r-base
......
......@@ -75,8 +75,14 @@ lapack = --with-lapack
# edd 11 Oct 2011 setting -std=gnu99 with compiler (thanks, Kurt Hornik)
fortrancompiler = F77=gfortran
f95compiler = gfortran
# edd 10 Jan 2016 mips currently needs gcc-4.9 (cf #810357) and big thanks to Sébastien Villemot
ifeq ($(arch),mips)
compiler = "gcc-4.9 -std=gnu99"
else
compiler = "gcc -std=gnu99"
endif
cxxcompiler = g++
# edd 31 Mar 2014
#optimflags = -O3 -pipe
optimflags = $(shell dpkg-buildflags --get CFLAGS)
......@@ -122,12 +128,13 @@ endif
## edd 02 Jun 2003 use this on arm only
## edd 12 May 2010 no longer use it on arm either -- thx Modestas
## edd 04 Aug 2010 on mips and mipsel, don't use -g
## edd 10 Jan 2016 turn all off again
##ifneq "$(findstring $(arch), m68k arm)" ""
#ifneq "$(findstring $(arch), arm)" ""
ifneq "$(findstring $(arch), mips mipsel)" ""
optimflags = -g0
#optimflags = -O0 -g0
endif
#ifneq "$(findstring $(arch), mips mipsel)" ""
#optimflags = -g0
##optimflags = -O0 -g0
#endif
## edd 04 Apr 2009 Alpha dies on deriv.c, trying will less optimisation
## edd 16 Apr 2009 commented-out as Kurt Roeckx applied a gcc patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment