diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-04 11:38:17 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-04 11:38:17 +0200 |
| commit | cb50c03eae9d9837f971d92adf596fa9e614086d (patch) | |
| tree | d8b48deac20fb08bdd8cdfc645879d6c6a5387a6 | |
| parent | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (diff) | |
Build fixes.
| -rw-r--r-- | extra/glib/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/imagemagick/PKGBUILD | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index 120a737cb..14c76e55c 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -31,6 +31,8 @@ build() { CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu' elif [[ $CARCH = "x86_64" ]]; then CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + else + CONFIGFLAG="--host=$CHOST --target=$CHOST" fi autoreconf --force --install diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 258890d1f..82414c855 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -9,8 +9,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \ - 'opencl-headers' 'libcl') + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') +[ "$CARCH" != "mips64el" ] && makedepends+=('opencl-headers' 'libcl') #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) @@ -26,12 +26,13 @@ prepare() { build() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} + [ "$CARCH" != "mips64el" ] && extraconf="--enable-opencl" ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ - --enable-opencl --without-gvc --without-djvu --without-autotrace \ - --without-webp --without-jbig --without-fpx --without-dps --without-fftw + --without-gvc --without-djvu --without-autotrace \ + --without-webp --without-jbig --without-fpx --without-dps --without-fftw $extraconf make } @@ -42,7 +43,7 @@ check() { package_imagemagick() { pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl') + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') optdepends=('ghostscript: for Ghostscript support' 'openexr: for OpenEXR support' 'libwmf: for WMF support' @@ -64,6 +65,7 @@ package_imagemagick() { "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml" "etc/ImageMagick-${pkgver%%.*}/type-windows.xml") options=('!docs' 'libtool' '!emptydirs') + [ "$CARCH" != "mips64el" ] && depends+=('libcl') cd ImageMagick-${pkgver%.*}-${pkgver##*.} make -j1 DESTDIR="${pkgdir}" install |