Date: Thursday, February 11, 2010 @ 11:58:19
Author: ronald
Revision: 68212
Merged revisions 67901 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/grub2/trunk
........
r67901 | ronald | 2010-02-09 14:30:08 +0100 (Tue, 09 Feb 2010) | 2 lines
upgpkg: grub2 1.97.2-1
update to latest version; grub2 now compiles on x86_64: FS#18217
........
Modified:
grub2/repos/extra-i686/ (properties)
grub2/repos/extra-i686/PKGBUILD
----------+
PKGBUILD | 36 ++++++------------------------------
1 file changed, 6 insertions(+), 30 deletions(-)
Property changes on: grub2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /grub2/trunk:1-58619
+ /grub2/trunk:1-68211
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-02-11 15:31:06 UTC (rev 68211)
+++ extra-i686/PKGBUILD 2010-02-11 16:58:19 UTC (rev 68212)
@@ -3,7 +3,7 @@
# Contributor: dongiovanni <dongiovanni.archlinux.de>
pkgname=grub2
-pkgver=1.97.1
+pkgver=1.97.2
pkgrel=1
pkgdesc="The GNU GRand Unified Bootloader"
url="http://www.gnu.org/software/grub/";
@@ -22,14 +22,10 @@
'grub.cfg')
# don't install auto-install script. TODO: It needs a rewrite to work with
grub2
# 'install-grub')
-md5sums=('66fe18cd9318e3d67a34d7b7a8e7b1f6'
+md5sums=('db4d23fb8897523a7e484e974ae3d1c9'
'743215998a581a54ac77630f0db222ce')
build() {
- # Set destination architecture here
- #DESTARCH="i686"
- DESTARCH="x86_64"
-
cd $srcdir/grub-${pkgver}
# run autogen.sh to create configure files
./autogen.sh
@@ -37,35 +33,15 @@
# fix unifont.bdf location
sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure
|| return 1
- # Arch64 grub2 needs to be statically build on i686
- if [ "$CARCH" = "x86_64" ]; then
- echo "this package has to be built on i686, won't compile on x86_64"
- sleep 5
- else
+ CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
+ --sbindir=/sbin --mandir=/usr/share/man \
+ --infodir=/usr/share/info --sysconfdir=/etc
- if [ "$DESTARCH" = "x86_64" ]; then
- export LDFLAGS=-static
- export CFLAGS=-static
- ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
- --sbindir=/sbin --mandir=/usr/share/man \
- --infodir=/usr/share/info --sysconfdir=/etc
- unset CFLAGS CPPFLAGS LDFLAGS
-
- else
- CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \
- --sbindir=/sbin --mandir=/usr/share/man \
- --infodir=/usr/share/info --sysconfdir=/etc
- fi
- fi
-
CFLAGS= make || return 1
make DESTDIR=${pkgdir} install || return 1
install -Dm644 ${srcdir}/grub.cfg $startdir/pkg/boot/grub/grub.cfg
#install -Dm755 ${srcdir}/install-grub $startdir/pkg/sbin/install-grub
- # Fool makepkg into building a x86_64 package
- if [ "$DESTARCH" = "x86_64" ]; then
- export CARCH="x86_64"
- fi
}
+
