[arch-commits] Commit in octave/trunk (3 files)

[Ronald van Haren]

    Date: Sunday, June 2, 2013 @ 12:21:12
  Author: ronald
Revision: 186979

upgpkg: octave 3.6.4-2

remove unneeded FFLAGS  FS#35384; apply backported upstream patch for mex support with gcc 4.8

Added:
  octave/trunk/mex-gcc-4.8.patch
Modified:
  octave/trunk/PKGBUILD
Deleted:
  octave/trunk/octave-gethelp.patch

----------------------+
 PKGBUILD             |   14 ++++++++------
 mex-gcc-4.8.patch    |   31 +++++++++++++++++++++++++++++++
 octave-gethelp.patch |   13 -------------
 3 files changed, 39 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-02 08:35:25 UTC (rev 186978)
+++ PKGBUILD	2013-06-02 10:21:12 UTC (rev 186979)
@@ -5,7 +5,7 @@
 
 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,20 +14,22 @@
 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}"
 
+  # https://savannah.gnu.org/bugs/?38746
+  patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch"
+
   autoreconf -vfi
 
-  # http://www.nabble.com/Random-rounding-errors-td16010966.html
-  FFLAGS="-O -ffloat-store" \
-
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
   --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html

Added: mex-gcc-4.8.patch
===================================================================
--- mex-gcc-4.8.patch	                        (rev 0)
+++ mex-gcc-4.8.patch	2013-06-02 10:21:12 UTC (rev 186979)
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User Clemens Buchacher <drizzd at 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

Deleted: octave-gethelp.patch
===================================================================
--- octave-gethelp.patch	2013-06-02 08:35:25 UTC (rev 186978)
+++ octave-gethelp.patch	2013-06-02 10:21:12 UTC (rev 186979)
@@ -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; \