[arch-commits] Commit in libjpeg/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Allan McRae]

    Date: Saturday, October 18, 2008 @ 00:15:07
  Author: allan
Revision: 15746

Fix x86_64 build problem

Modified:
  libjpeg/repos/extra-x86_64/	(properties)
  libjpeg/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)


Property changes on: libjpeg/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libjpeg/trunk:1
   + /libjpeg/trunk:1-15745

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-18 04:12:24 UTC (rev 15745)
+++ extra-x86_64/PKGBUILD	2008-10-18 04:15:07 UTC (rev 15746)
@@ -1,26 +1,25 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=libjpeg
 pkgver=6b
-pkgrel=4
+pkgrel=5.1
 pkgdesc="Library of JPEG support functions"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+license=('custom')
 depends=('glibc')
+options=(!libtool)
 source=(ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v$pkgver.tar.gz)
 md5sums=('dbd5f3b47ed13132f04c685d608a7547')
 
 build() {
-  cd $startdir/src/jpeg-$pkgver
-if [ "$CARCH" == "x86_64" ]; then
-  rm config.sub config.guess
-  ln -s /usr/share/libtool/config.guess config.guess
-  ln -s /usr/share/libtool/config.sub config.sub
-fi
+  cd $srcdir/jpeg-$pkgver
+  sed -i "s#./libtool#libtool#" configure
   ./configure --prefix=/usr --enable-shared --enable-static
   make || return 1
-  mkdir -p $startdir/pkg/usr/{bin,lib,include,man/man1}
-  make prefix=$startdir/pkg/usr install
-
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  mkdir -p $pkgdir/usr/{bin,lib,include,share/man/man1}
+  make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man/man1 install
+  install -m644 jpegint.h $pkgdir/usr/include
+  install -Dm644 README $pkgdir/usr/share/licenses/libjpeg/README
 }