[arch-commits] CVS update of extra/science/octave (PKGBUILD gcc-4.3.patch)
Jan de Groot
jgc at archlinux.org
Sun Mar 9 19:39:47 UTC 2008
Date: Sunday, March 9, 2008 @ 15:39:47
Author: jgc
Path: /home/cvs-extra/extra/science/octave
Added: gcc-4.3.patch (1.1)
Modified: PKGBUILD (1.17 -> 1.18)
upgpkg: octave 2.1.73-5
Build with gfortran 4.3
---------------+
PKGBUILD | 28 ++++++-----
gcc-4.3.patch | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+), 11 deletions(-)
Index: extra/science/octave/PKGBUILD
diff -u extra/science/octave/PKGBUILD:1.17 extra/science/octave/PKGBUILD:1.18
--- extra/science/octave/PKGBUILD:1.17 Mon May 28 18:07:32 2007
+++ extra/science/octave/PKGBUILD Sun Mar 9 15:39:47 2008
@@ -1,31 +1,37 @@
-# $Id: PKGBUILD,v 1.17 2007/05/28 22:07:32 jgc Exp $
+# $Id: PKGBUILD,v 1.18 2008/03/09 19:39:47 jgc Exp $
# Maintainer: damir <damir at archlinux.org>
pkgname=octave
pkgver=2.1.73
-pkgrel=4
+pkgrel=5
pkgdesc="Octave is a high-level language, primarily intended for numerical computations."
arch=(i686 x86_64)
url="http://www.octave.org"
-depends=('gcc-fortran>=4.2.0' 'readline' 'fftw' 'blas')
+depends=('gcc-libs>=4.3.0' 'readline' 'fftw>=3.1.2-2' 'blas>=19980702-4')
mirror="ftp://ftp.octave.org/pub/octave/obsolete/"
#mirror="ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/"
#source=("ftp://ftp.octave.org/pub/octave/$pkgname-$pkgver.tar.bz2")
-source=("$mirror$pkgname-$pkgver.tar.bz2" "$pkgname.png" "$pkgname.desktop")
-install=$pkgname.install
+source=(${mirror}${pkgname}-${pkgver}.tar.bz2
+ octave.png
+ octave.desktop
+ gcc-4.3.patch)
+install=octave.install
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd ${startdir}/src/${pkgname}-${pkgver}
+ patch -Np1 -i ${startdir}/src/gcc-4.3.patch || return 1
FFLAGS="-O -ffloat-store" ./configure \
--prefix=/usr \
--enable-shared \
--enable-dl
make || return 1
- make DESTDIR=$startdir/pkg install
+ make DESTDIR=${startdir}/pkg install || return 1
# install some freedesktop.org compatibility
- install -D -m644 $startdir/src/$pkgname.desktop \
- $startdir/pkg/usr/share/applications/$pkgname.desktop
- install -D -m644 $startdir/src/$pkgname.png \
- $startdir/pkg/usr/share/pixmaps/$pkgname.png
+ install -d -m755 ${startdir}/pkg/usr/share/applications
+ install -d -m755 ${startdir}/pkg/usr/share/pixmaps
+ install -m644 ${startdir}/src/octave.desktop \
+ ${startdir}/pkg/usr/share/applications/ || return 1
+ install -m644 ${startdir}/src/octave.png \
+ ${startdir}/pkg/usr/share/pixmaps/ || return 1
}
Index: extra/science/octave/gcc-4.3.patch
diff -u /dev/null extra/science/octave/gcc-4.3.patch:1.1
--- /dev/null Sun Mar 9 15:39:47 2008
+++ extra/science/octave/gcc-4.3.patch Sun Mar 9 15:39:47 2008
@@ -0,0 +1,141 @@
+--- octave2.1-2.1.73.orig/doc/interpreter/munge-texi.cc
++++ octave2.1-2.1.73/doc/interpreter/munge-texi.cc
+@@ -30,6 +30,8 @@
+ #include <fstream>
+ #include <string>
+ #include <map>
++#include <cstdlib>
++#include <cstring>
+
+ static const char doc_delim = ' ';
+
+--- octave2.1-2.1.73.orig/liboctave/data-conv.cc
++++ octave2.1-2.1.73/liboctave/data-conv.cc
+@@ -26,6 +26,7 @@
+ #endif
+
+ #include <cctype>
++#include <cstdlib>
+
+ #include <iostream>
+
+--- octave2.1-2.1.73.orig/liboctave/lo-utils.cc
++++ octave2.1-2.1.73/liboctave/lo-utils.cc
+@@ -29,6 +29,7 @@
+ #include <climits>
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+
+ #include <string>
+
+--- octave2.1-2.1.73.orig/liboctave/oct-env.cc
++++ octave2.1-2.1.73/liboctave/oct-env.cc
+@@ -43,6 +43,7 @@
+
+ #include <cctype>
+ #include <cstdlib>
++#include <cstring>
+
+ #include <string>
+
+--- octave2.1-2.1.73.orig/src/unwind-prot.cc
++++ octave2.1-2.1.73/src/unwind-prot.cc
+@@ -30,6 +30,7 @@
+ #endif
+
+ #include <cstddef>
++#include <cstring>
+
+ #include "CMatrix.h"
+
+--- octave2.1-2.1.73.orig/src/pr-output.cc
++++ octave2.1-2.1.73/src/pr-output.cc
+@@ -32,6 +32,7 @@
+
+ #include <iomanip>
+ #include <iostream>
++#include <sstream>
+ #include <string>
+
+ #include "Array-util.h"
+@@ -1602,7 +1603,7 @@
+ }
+
+ template <>
+-static inline void
++/* static */ inline void
+ pr_plus_format (std::ostream& os, const Complex& c)
+ {
+ double rp = c.real ();
+--- octave2.1-2.1.73.orig/src/DLD-FUNCTIONS/sort.cc
++++ octave2.1-2.1.73/src/DLD-FUNCTIONS/sort.cc
+@@ -26,6 +26,8 @@
+ #include <config.h>
+ #endif
+
++#include <vector>
++
+ #include "lo-mappers.h"
+ #include "quit.h"
+
+@@ -294,7 +296,7 @@
+ template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>;
+
+ template <>
+-static octave_value
++/* static */ octave_value
+ mx_sort (ArrayN<double> &m, int dim, sortmode mode)
+ {
+ octave_value retval;
+@@ -431,7 +433,7 @@
+ }
+
+ template <>
+-static octave_value_list
++/* static */ octave_value_list
+ mx_sort_indexed (ArrayN<double> &m, int dim, sortmode mode)
+ {
+ octave_value_list retval;
+--- octave2.1-2.1.73.orig/liboctave/oct-sort.cc
++++ octave2.1-2.1.73/liboctave/oct-sort.cc
+@@ -84,6 +84,8 @@
+ #include <config.h>
+ #endif
+
++#include <cstdlib>
++#include <cstring>
+ #include "lo-mappers.h"
+ #include "quit.h"
+ #include "oct-sort.h"
+--- octave2.1-2.1.73.orig/liboctave/chMatrix.cc
++++ octave2.1-2.1.73/liboctave/chMatrix.cc
+@@ -30,6 +30,8 @@
+ #include <config.h>
+ #endif
+
++#include <cstring>
++
+ #include <iostream>
+ #include <string>
+
+--- octave-2.1.73/src/file-io.cc.orig 2008-03-09 18:48:12.000000000 +0000
++++ octave-2.1.73/src/file-io.cc 2008-03-09 18:48:51.000000000 +0000
+@@ -42,6 +42,7 @@
+ #include <cerrno>
+ #include <climits>
+ #include <cstdio>
++#include <cstring>
+
+ #include <iostream>
+ #include <vector>
+--- octave-2.1.73/src/parse.y.orig 2008-03-09 18:52:16.000000000 +0000
++++ octave-2.1.73/src/parse.y 2008-03-09 18:52:25.000000000 +0000
+@@ -34,6 +34,7 @@
+
+ #include <cassert>
+ #include <cstdio>
++#include <cstring>
+
+ #ifdef YYBYACC
+ #include <cstdlib>
More information about the arch-commits
mailing list