diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-21 19:14:29 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-21 19:14:29 +0100 |
| commit | cf1b8826accdb5f1a092ed387f66f061920c4953 (patch) | |
| tree | 0f9e18d9f18ee0690b50935f93887a9417366e4d | |
| parent | 3bde3a0e359ee1506eb0f48af640b1b825198544 (diff) | |
Revert my changes to umfpack's PKGBUILD, it made octave not link.
| -rw-r--r-- | extra/umfpack/PKGBUILD | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD index 7e1772adc..d2e8aa764 100644 --- a/extra/umfpack/PKGBUILD +++ b/extra/umfpack/PKGBUILD @@ -10,12 +10,15 @@ _amdver=2.2.1 _cholmodver=1.7.1 _colamdver=2.7.2 _ccolamdver=2.7.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="A multifrontal direct solver for unsymmetric linear systems (AMD/${_amdver}, UFConfig/${_ufcgfgver})" arch=('i686' 'x86_64' 'mips64el') url="http://www.cise.ufl.edu/research/sparse/umfpack" license=('LGPL') makedepends=('lapack' 'blas') +noextract=(CHOLMOD-${_cholmodver}.tar.gz + COLAMD-${_colamdver}.tar.gz + CCOLAMD-${_ccolamdver}.tar.gz) source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-${_ufcfgver}.tar.gz http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz @@ -35,8 +38,7 @@ build() { cd "$srcdir/UMFPACK" cp -rf "$srcdir/UFconfig/xerbla" . cp -L ../UFconfig.mk $startdir/src/UFconfig - [ "${CARCH}" != "i686" ] && CFLAGS="${CFLAGS} -fPIC" - sed -ri 's#^((C|F77)FLAGS = ).*#\1'"$CFLAGS"'#' $srcdir/UFconfig/UFconfig.mk + [ $CARCH != "i686" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk make library || return 1 install -d "$pkgdir/usr/lib" "$pkgdir/usr/include" |