diff options
| author | root <root@rshg054.dnsready.net> | 2013-06-03 00:08:24 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-06-03 00:08:24 -0700 |
| commit | 1f86bf1b08cb980cea57c1d4d3187e2251f5a63b (patch) | |
| tree | 1d7dc66a7f904a5e311c2924518469c9b72a3c82 /extra/octave | |
| parent | 8831500349d38b0b1afcb74ada3f6878c31fb6ef (diff) | |
Mon Jun 3 00:08:24 PDT 2013
Diffstat (limited to 'extra/octave')
| -rw-r--r-- | extra/octave/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/octave/mex-gcc-4.8.patch | 31 | ||||
| -rw-r--r-- | extra/octave/octave-gethelp.patch | 13 |
3 files changed, 40 insertions, 20 deletions
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index e72c8e08a..ae93b817e 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185713 2013-05-17 13:46:00Z ronald $ +# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" @@ -14,19 +14,21 @@ depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitespars makedepends=('gcc-fortran' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') -source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}) +source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} + mex-gcc-4.8.patch) options=('!emptydirs') install=octave.install sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' - 'SKIP') + 'SKIP' + '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60') build() { cd "${srcdir}/${pkgname}-${pkgver}" - autoreconf -vfi + # https://savannah.gnu.org/bugs/?38746 + patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch" - # http://www.nabble.com/Random-rounding-errors-td16010966.html - FFLAGS="-O -ffloat-store" \ + autoreconf -vfi ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch new file mode 100644 index 000000000..99d501879 --- /dev/null +++ b/extra/octave/mex-gcc-4.8.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Clemens Buchacher <drizzd@aon.at> +# Date 1369937542 14400 +# Thu May 30 14:12:22 2013 -0400 +# Node ID 122d3f62e179ba044d47e58510905719220d8706 +# Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73 +do not include C++ header in extern "C" context (bug #38746) + +* mex.h: Include mexproto.h outside of extern "C" block. + +diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h +--- a/src/mex.h Mon May 27 21:41:57 2013 +0200 ++++ b/src/mex.h Thu May 30 14:12:22 2013 -0400 +@@ -64,6 +64,8 @@ + + #define mxMAXNAME 64 + ++#include "mexproto.h" ++ + #if defined (__cplusplus) + extern "C" { + #endif +@@ -74,8 +76,6 @@ + void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]); + #endif + +-#include "mexproto.h" +- + /* V4 floating point routines renamed in V5. */ + #define mexIsNaN mxIsNaN + #define mexIsFinite mxIsFinite diff --git a/extra/octave/octave-gethelp.patch b/extra/octave/octave-gethelp.patch deleted file mode 100644 index c0e693abc..000000000 --- a/extra/octave/octave-gethelp.patch +++ /dev/null @@ -1,13 +0,0 @@ -Help parallel compilation -patch by Sebastien Fabbro ---- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 -+++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 -@@ -316,7 +316,7 @@ - - gethelp_SOURCES = gethelp.cc - --.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile -+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp - @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ - cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ |