[arch-commits] Commit in grub2-efi-x86_64/trunk (PKGBUILD ldflags.patch)

Ronald van Haren ronald at archlinux.org
Mon Apr 2 13:34:34 EDT 2012


    Date: Monday, April 2, 2012 @ 13:34:34
  Author: ronald
Revision: 155378

upgpkg: grub2-efi-x86_64 1:2.00beta3-1

upstream update to 2.00beta3; add ldflags patch

Added:
  grub2-efi-x86_64/trunk/ldflags.patch
Modified:
  grub2-efi-x86_64/trunk/PKGBUILD

---------------+
 PKGBUILD      |   20 +++++++++++++-------
 ldflags.patch |   15 +++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-02 17:15:46 UTC (rev 155377)
+++ PKGBUILD	2012-04-02 17:34:34 UTC (rev 155378)
@@ -2,14 +2,14 @@
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
 _grub_bzr_rev="4169"
-_pkgver="2.00~beta2"
+_pkgver="2.00~beta3"
 
 _grub_lua_ver=24
 _grub_gpxe_ver=12
 
 pkgname=grub2-efi-x86_64
-pkgver=2.00beta2
-pkgrel=2
+pkgver=2.00beta3
+pkgrel=1
 epoch=1
 pkgdesc="The GNU GRand Unified Bootloader version 2 - x86_64 UEFI version"
 url="http://www.gnu.org/software/grub/"
@@ -24,15 +24,17 @@
 # source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz"
 source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
         "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz")
+        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz"
+	"ldflags.patch")
 
 noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
            "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz")
 
-sha1sums=('2ba583f9466fb676b0ae3d7a9a82d1299b153a98'
+sha1sums=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2'
           '89290031b974780c6df76893836d2477d4add895'
-          'b04994c005910b4bf123f034b30109d5c8d6fd86')
-
+          'b04994c005910b4bf123f034b30109d5c8d6fd86'
+          'ef68a1b0f50174633fb738b8fb8c2e66844ece2d')
+	
 build() {
 
 	if [[ "${CARCH}" == 'i686' ]]; then
@@ -42,6 +44,9 @@
 
 	cd "${srcdir}/grub-${_pkgver}"
 
+	# fix LDFLAGS
+	patch -Np1 -i ${srcdir}/ldflags.patch
+
 	## add grub-extras
 	export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}/grub-extras/" 
 	install -d "${srcdir}/grub-${_pkgver}/grub-extras"
@@ -82,6 +87,7 @@
 		--with-grubdir="grub" \
 		--disable-werror
 
+
 	CFLAGS="" make
 
 }

Added: ldflags.patch
===================================================================
--- ldflags.patch	                        (rev 0)
+++ ldflags.patch	2012-04-02 17:34:34 UTC (rev 155378)
@@ -0,0 +1,15 @@
+--- grub-1.99.orig/conf/Makefile.common
++++ grub-1.99/conf/Makefile.common
+@@ -11,10 +11,10 @@ if COND_i386_pc
+   CFLAGS_PLATFORM += -mrtd -mregparm=3
+ endif
+ if COND_i386_efi
+-  LDFLAGS_PLATFORM = -melf_i386
++  LDFLAGS_PLATFORM = -Wl,-melf_i386
+ endif
+ if COND_x86_64_efi
+-  LDFLAGS_PLATFORM = -melf_x86_64
++  LDFLAGS_PLATFORM = -Wl,-melf_x86_64
+ endif
+ if COND_i386_qemu
+   CFLAGS_PLATFORM += -mrtd -mregparm=3



More information about the arch-commits mailing list