diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 14:16:08 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-11 14:16:08 -0300 |
| commit | 20604a1579dcd51b5a46fc7d09cf4b1535219446 (patch) | |
| tree | 2d5fd72b25008b56e2121bb35665ebeaebd50140 /extra/octave | |
| parent | d84e7e621b059d11c483d6864cb1a549572d1821 (diff) | |
| parent | 139460a7a8b085588b699c488fd19b166db18a74 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/logrotate/PKGBUILD
extra/hwloc/PKGBUILD
extra/kdeutils/PKGBUILD
extra/lapack/PKGBUILD
extra/openmpi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mesa/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/octave')
| -rw-r--r-- | extra/octave/PKGBUILD | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 59f6d7e5d..b6e723f7c 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120945 2011-04-27 18:09:04Z ronald $ +# $Id: PKGBUILD 131039 2011-07-09 20:49:15Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.4.0 -pkgrel=2 +pkgver=3.4.2 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') url="http://www.octave.org" @@ -15,24 +15,22 @@ makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' 'umfpack: LU decomposition of some large sparse matrices') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" - octave-3.4.0-gcc46.patch) +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") options=('!emptydirs') #install=octave.install -sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8' - '791c905a80510783e5f9c556c12f02400887fbec') +sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5') build() { cd ${srcdir}/${pkgname}-${pkgver} - # fedora gcc46 patch - patch -Np1 -i ${srcdir}/octave-3.4.0-gcc46.patch - # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ + # Avoid build failure due to missing curl/types.h + sed -i "/curl\/types.h/d" src/DLD-FUNCTIONS/urlwrite.cc + ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static --disable-docs + --enable-shared --disable-static --disable-docs make } @@ -41,4 +39,8 @@ package(){ cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install + + # add octave library path to ld.so.conf.d + install -d ${pkgdir}/etc/ld.so.conf.d + echo "/usr/lib/${pkgname}-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf } |