[arch-commits] Commit in lilo (4 files)

[Tobias Powalowski]

    Date: Saturday, May 30, 2009 @ 11:07:32
  Author: tpowa
Revision: 40703

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

........
  r40702 | tpowa | 2009-05-30 17:06:33 +0200 (Sa, 30 Mai 2009) | 2 lines
  
  'fixed locale while building'
........

Modified:
  lilo/repos/core-i686/	(properties)
  lilo/repos/core-i686/PKGBUILD
  lilo/trunk/PKGBUILD
Deleted:
  lilo/repos/core-i686/gcc-44.patch

------------------------------+
 repos/core-i686/PKGBUILD     |    2 +-
 repos/core-i686/gcc-44.patch |   11 -----------
 trunk/PKGBUILD               |    1 -
 3 files changed, 1 insertion(+), 13 deletions(-)


Property changes on: lilo/repos/core-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /lilo/trunk:1-38710
   + /lilo/trunk:1-40702

Modified: repos/core-i686/PKGBUILD
===================================================================
--- repos/core-i686/PKGBUILD	2009-05-30 15:06:33 UTC (rev 40702)
+++ repos/core-i686/PKGBUILD	2009-05-30 15:07:32 UTC (rev 40703)
@@ -29,7 +29,7 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i ../gcc-44.patch || return 1
+  LANG=EN_US
   make all || return 1
   make ROOT=$pkgdir MAN_DIR=/usr/share/man install
   mkdir -p $pkgdir/etc

Deleted: repos/core-i686/gcc-44.patch
===================================================================
--- repos/core-i686/gcc-44.patch	2009-05-30 15:06:33 UTC (rev 40702)
+++ repos/core-i686/gcc-44.patch	2009-05-30 15:07:32 UTC (rev 40703)
@@ -1,11 +0,0 @@
---- checkit~	2009-05-10 07:20:20.000000000 +0000
-+++ checkit	2009-05-10 07:20:20.000000000 +0000
-@@ -45,7 +45,7 @@
- #echo
- echo GCC version 2.91 or later is required
- gcc -v 1>foo1 2>foo2
--V=`cat foo1 foo2 | grep version | cut -d " " -f 3`
-+V=`cat foo1 foo2 | grep Version | cut -d " " -f 2`
- rm -f foo1 foo2
- if [ -z $V ]; then
- 	echo gcc is not present

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-05-30 15:06:33 UTC (rev 40702)
+++ trunk/PKGBUILD	2009-05-30 15:07:32 UTC (rev 40703)
@@ -22,7 +22,6 @@
 options=(!makeflags)
 source=(#http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-$pkgver.src.tar.gz
 	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-$pkgver.src.tar.gz
-        gcc-44.patch
 	lilo.conf)
 md5sums=('72765f2aafd20e23ecf07ebd22baeec7'
 	 'a3a4c90bead3f9b8672bd384ff9f8db1')