[arch-commits] Commit in glib/repos (3 files)

[Eric Bélanger]

    Date: Wednesday, October 14, 2009 @ 22:42:14
  Author: eric
Revision: 55861

Merged revisions 55860 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/glib/trunk

........
  r55860 | eric | 2009-10-14 22:41:58 -0400 (Wed, 14 Oct 2009) | 2 lines
  
  upgpkg: glib 1.2.10-8.1
      Fixed configure options for x86_64 (close FS#16658)
........

Modified:
  glib/repos/extra-x86_64/	(properties)
  glib/repos/extra-x86_64/ChangeLog
  glib/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)


Property changes on: glib/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /glib/trunk:1-48444
   + /glib/trunk:1-55860

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-10-15 02:41:58 UTC (rev 55860)
+++ extra-x86_64/ChangeLog	2009-10-15 02:42:14 UTC (rev 55861)
@@ -1,3 +1,8 @@
+2009-10-14  Eric Belanger  <eric at archlinux.org>
+
+	* glib 1.2.10-8.1
+	* Fixed configure options for x86_64 (close FS#16658)
+
 2009-08-01  Eric Belanger  <eric at archlinux.org>
 
 	* glib 1.2.10-8

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-15 02:41:58 UTC (rev 55860)
+++ extra-x86_64/PKGBUILD	2009-10-15 02:42:14 UTC (rev 55861)
@@ -4,7 +4,7 @@
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=8
+pkgrel=8.1
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,8 +13,7 @@
 options=('!libtool')
 install=glib.install
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
-	gcc340.patch \
-	aclocal-fixes.patch)
+	gcc340.patch aclocal-fixes.patch)
 md5sums=('6fe30dad87c77b91b632def29dd69ef9' '877b3330e822a4be69a0f8a8c268cfd7'\
          'e52c4b88427b9785bb8049dbdc9ff6fb')
 sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\
@@ -25,10 +24,8 @@
   patch -Np1 -i ../gcc340.patch || return 1
   patch -Np0 -i ../aclocal-fixes.patch || return 1
 
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-    --host=i686-pc-linux-gnu || return 1
+  [ "$CARCH" = "x86_64" ] && CONFIGFLAG="--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu"
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info $CONFIGFLAG || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  rm "${pkgdir}/usr/share/info/dir"
-  gzip "${pkgdir}/usr/share/info/glib.info"
 }