[arch-commits] Commit in lilo/trunk (PKGBUILD gcc-44.patch)

[Tobias Powalowski]

    Date: Sunday, May 10, 2009 @ 03:23:42
  Author: tpowa
Revision: 38708

upgpkg: lilo 22.8-3

Added:
  lilo/trunk/gcc-44.patch
Modified:
  lilo/trunk/PKGBUILD

--------------+
 PKGBUILD     |   20 ++++++++++++--------
 gcc-44.patch |   11 +++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-10 07:21:19 UTC (rev 38707)
+++ PKGBUILD	2009-05-10 07:23:42 UTC (rev 38708)
@@ -4,7 +4,7 @@
 
 pkgname=lilo
 pkgver=22.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A bootloader for Linux"
 arch=(i686 x86_64)
 #url="http://lilo.go.dyndns.org" - seems down
@@ -19,17 +19,21 @@
 depends=(device-mapper coreutils)
 makedepends=(bin86)
 install=lilo.install
+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')
+md5sums=('72765f2aafd20e23ecf07ebd22baeec7'
+	 'a3a4c90bead3f9b8672bd384ff9f8db1')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  make || return 1
-  make ROOT=$startdir/pkg MAN_DIR=/usr/man install
-  mkdir -p $startdir/pkg/etc
-  cp $startdir/$pkgname.conf $startdir/pkg/etc/
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np0 -i ../gcc-44.patch || return 1
+  make all || return 1
+  make ROOT=$pkgdir MAN_DIR=/usr/share/man install
+  mkdir -p $pkgdir/etc
+  cp $startdir/$pkgname.conf $pkgdir/etc/
   # install license
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/license.txt
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/license.txt
 }

Added: gcc-44.patch
===================================================================
--- gcc-44.patch	                        (rev 0)
+++ gcc-44.patch	2009-05-10 07:23:42 UTC (rev 38708)
@@ -0,0 +1,11 @@
+--- 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