grub-legacy-0.97-1: new package that replaces grub

1 files changed, 34 insertions, 42 deletions

diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index d63a33ec9..a582a68fe 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
+# $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
-pkgname=grub
+pkgname=grub-legacy
+_srcname=grub
 pkgver=0.97
-pkgrel=21.4
+pkgrel=1
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
-groups=('base')
 depends=('ncurses' 'diffutils' 'sed')
+conflicts=('grub' 'grub-common')
+replaces=('grub')
+provides=("grub=${pkgver}")
+[ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
 optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
-source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
+source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
         menu.lst
         install-grub
         040_all_grub-0.96-nxstack.patch
@@ -23,8 +28,9 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
         more-raid.patch
         intelmac.patch
         grub-inode-size.patch
-	ext4.patch
-	grub-0.97-ldflags-objcopy-remove-build-id.patch)
+        ext4.patch
+        grub-0.97-ldflags-objcopy-remove-build-id.patch
+        automake-pkglib.patch)
 backup=('boot/grub/menu.lst')
 install=grub.install
 sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
@@ -38,16 +44,11 @@ sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
           '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
           '0436aa6fa0b6f768289172f983a3f4b69384629e'
           'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
-          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
-
-#set destination architecture here
-#DESTARCH="i686"
-DESTARCH="x86_64"
-
+          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869'
+          '776ed278eb8ff80e949834f763fad68b8741e7cd')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g'
+  cd ${srcdir}/${_srcname}-${pkgver}
 
   # optimizations break the build -- disable them
   # adding special devices to grub, patches are from fedora
@@ -62,9 +63,11 @@ build() {
   patch -Np1 -i ../ext4.patch
   # binutils fix
   patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+  # "pkglib" is a reserved keyword in automake fix
+  patch -Np1 -i ../automake-pkglib.patch
 
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
 
   ## recreate ./configure script with the required changes in LDFLAGS and objcopy
   aclocal
@@ -72,36 +75,25 @@ build() {
   autoreconf
   automake
 
-  #arch64 fixes for static build
-  if [ "$CARCH" = "x86_64" ]; then  ## correcting problems for new wersion of autotools
-
-    echo "this package has to be built on i686, won't compile on x86_64"
-    sleep 5
+  if [ "$CARCH" = "x86_64" ]; then
+    # patch from gentoo for fixing a segfault
+    patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
+    # patch from frugalware to make it boot when more than 2GB ram installed
+    patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
+    CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                         --mandir=/usr/share/man --infodir=/usr/share/info
   else
-    if [ "$DESTARCH" = "x86_64" ]; then
-      # patch from gentoo for fixing a segfault
-      patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
-      # patch from frugalware to make it boot when more than 2GB ram installed
-      patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
-      CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
-                           --mandir=/usr/share/man --infodir=/usr/share/info
-    else
-      CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
-                  --mandir=/usr/share/man --infodir=/usr/share/info
-    fi
+    CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                --mandir=/usr/share/man --infodir=/usr/share/info
   fi
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${_srcname}-${pkgver}
 
   CFLAGS= make
-  make DESTDIR=$pkgdir install
-  install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
-  install -D -m755 ../install-grub $pkgdir/sbin/install-grub
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst
+  install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub
 
-  if [ "$DESTARCH" = "x86_64" ]; then
-    # fool makepkg into building a x86_64 package
-    export CARCH="x86_64"
-  fi
 }