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

[Dan McGee]

    Date: Sunday, August 2, 2009 @ 23:00:43
  Author: dan
Revision: 48523

Merged revisions 48522 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/pacman/trunk

........
  r48522 | dan | 2009-08-02 22:00:33 -0500 (Sun, 02 Aug 2009) | 1 line
  
  upgpkg: pacman 3.3.0-2
........

Modified:
  pacman/repos/testing-x86_64/	(properties)
  pacman/repos/testing-x86_64/PKGBUILD
  pacman/repos/testing-x86_64/makepkg.conf

--------------+
 PKGBUILD     |   23 ++++++++++++++++++++---
 makepkg.conf |   10 +++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)


Property changes on: pacman/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /pacman/trunk:1-48517
   + /pacman/trunk:1-48522

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-08-03 03:00:33 UTC (rev 48522)
+++ testing-x86_64/PKGBUILD	2009-08-03 03:00:43 UTC (rev 48523)
@@ -4,7 +4,7 @@
 
 pkgname=pacman
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
@@ -21,7 +21,7 @@
         makepkg.conf)
 md5sums=('945b95633cc7340efb4d4564b463c6b1'
          '27271a59b9c9f748547ef4feae90bc5c'
-         '5e7a2edd59ea5b9ee95a8728f31530ac')
+         '5565518e3bba232951bb241323f50ed2')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -30,10 +30,27 @@
   make || return 1
   make DESTDIR=$pkgdir install || return 1
 
-  # install arch specific stuff
+  # install Arch specific stuff
   mkdir -p $pkgdir/etc
   install -m644 $srcdir/pacman.conf $pkgdir/etc/
   install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+  # set things correctly in the default conf file
+  case "$CARCH" in
+    i686)
+      mycarch="i686"
+      mychost="i686-pc-linux-gnu"
+      myflags="-march=i686 "
+      ;;
+    x86_64)
+      mycarch="x86_64"
+      mychost="x86_64-unknown-linux-gnu"
+      myflags="-march=x86-64 "
+      ;;
+  esac
+  sed -i $pkgdir/etc/makepkg.conf \
+    -e "s|@CARCH[@]|$mycarch|g" \
+    -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@CARCHFLAGS[@]|$myflags|g"
 
   # install completion files
   mkdir -p $pkgdir/etc/bash_completion.d/

Modified: testing-x86_64/makepkg.conf
===================================================================
--- testing-x86_64/makepkg.conf	2009-08-03 03:00:33 UTC (rev 48522)
+++ testing-x86_64/makepkg.conf	2009-08-03 03:00:43 UTC (rev 48523)
@@ -23,14 +23,14 @@
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
 #
-CARCH="x86_64"
-CHOST="x86_64-unknown-linux-gnu"
+CARCH="@CARCH@"
+CHOST="@CHOST@"
 
-#-- Exclusive: will only run on -march=x86-64 
+#-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
-CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
+CFLAGS="@CARCHFLAGS at -mtune=generic -O2 -pipe"
+CXXFLAGS="@CARCHFLAGS at -mtune=generic -O2 -pipe"
 #LDFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"