diff options
| author | Joe <joe@joelightning.com> | 2011-10-19 21:28:06 +0100 |
|---|---|---|
| committer | Joe <joe@joelightning.com> | 2011-10-19 21:28:06 +0100 |
| commit | 4fb8b61584b86fff65cf1e3b4ba472fb38bfa135 (patch) | |
| tree | ce0d63e6c66f1e890927a47e0dd42ccde252e19b /extra | |
| parent | f9658eff817b6e602c8d46197438d7ae38824d31 (diff) | |
| parent | 81ea1db768938c9fd25587c06107c22780f41706 (diff) | |
Merge branch 'master' of ssh://parabola-git/abslibre-mips64el
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/avahi/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/sane/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/umfpack/PKGBUILD | 12 |
3 files changed, 7 insertions, 17 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index b4e31041c..72a021dd1 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.30 -pkgrel=5 +pkgrel=5.1 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64' 'mips64el') url='http://www.avahi.org/' diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 49d0f1480..d1eda7ab0 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -28,20 +28,12 @@ build() { # fix https://bugs.archlinux.org/task/26114 patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch - if [ ${CARCH} == 'mips64el' ]; then - export CFLAGS="${CFLAGS} -O1" - EXTRAOPTS="--without-snmp" - else - EXTRAOPTS="" - fi - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ --enable-avahi \ - --disable-locking \ - $EXTRAOPTS + --disable-locking make } diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD index 5ebcf0a65..7e1772adc 100644 --- a/extra/umfpack/PKGBUILD +++ b/extra/umfpack/PKGBUILD @@ -16,9 +16,6 @@ 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 @@ -26,9 +23,9 @@ source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz UFconfig.mk) -md5sums=('b3490d4f529fbcf4f415e60aa2680a15' - '4335ee565feec67e8ba9fc0f6a5e2504' - '25548053958c1c5810b17d077b8f37b9' +md5sums=('19f5d8b4231ec9114718641ce51cce6e' + '526413bbbc94f987cf79619d9110bab4' + 'b3e9679ba20635ac4847f01c01d6e992' '9032c5724bee43ccd8f4546338a29fac' '2b4e43c8ef33dacfade6d1ec49542ac1' '79d813d5b54951060fc264172bfb5ca6' @@ -38,7 +35,8 @@ build() { cd "$srcdir/UMFPACK" cp -rf "$srcdir/UFconfig/xerbla" . cp -L ../UFconfig.mk $startdir/src/UFconfig - [ $CARCH == "x86_64" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk + [ "${CARCH}" != "i686" ] && CFLAGS="${CFLAGS} -fPIC" + sed -ri 's#^((C|F77)FLAGS = ).*#\1'"$CFLAGS"'#' $srcdir/UFconfig/UFconfig.mk make library || return 1 install -d "$pkgdir/usr/lib" "$pkgdir/usr/include" |