[arch-commits] Commit in gnu-efi-libs/trunk (PKGBUILD disable-ms_abi-flag.patch)

[Tobias Powalowski]

    Date: Monday, November 12, 2012 @ 08:58:45
  Author: tpowa
Revision: 170835

upgpkg: gnu-efi-libs 3.0s-2

fix compilation flags

Added:
  gnu-efi-libs/trunk/disable-ms_abi-flag.patch
Modified:
  gnu-efi-libs/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   15 +++++++++------
 disable-ms_abi-flag.patch |   16 ++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-11-12 13:27:20 UTC (rev 170834)
+++ PKGBUILD	2012-11-12 13:58:45 UTC (rev 170835)
@@ -6,7 +6,7 @@
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
 pkgver="${_pkgver}s"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
@@ -19,7 +19,9 @@
 provides=('gnu-efi')
 replaces=('gnu-efi')
 options=('!strip' '!makeflags')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"         gnu-efi-libs-x86_64-call-fix.patch)
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"         
+         gnu-efi-libs-x86_64-call-fix.patch
+         disable-ms_abi-flag.patch)
 
 _build_gnu-efi-libs-x86_64() {	
 	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
@@ -38,7 +40,9 @@
 build() {
         cd ${srcdir}/gnu-efi-${_pkgver}
         # fix http://sourceforge.net/tracker/?func=detail&aid=3576537&group_id=163609&atid=828423
-        patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch	
+        patch -Np1 -i ../gnu-efi-libs-x86_64-call-fix.patch
+        # fix broken ms_abi flags, causing weird issues with bootloaders
+        patch -Np1 -i ../disable-ms_abi-flag.patch
 	## Fix Makefiles to enable compile for both UEFI arch
 	sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults
 	sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults
@@ -75,7 +79,6 @@
 		_package_gnu-efi-libs-i386
 	fi	
 }
-md5sums=('c5081850414bec34d3e254e8e970811b'
-         '4b5428c51af1981d3eb158d924d6bf85')
 md5sums=('11f63d52071f7382f56c9e81d0aece91'
-         '4b5428c51af1981d3eb158d924d6bf85')
+         '4b5428c51af1981d3eb158d924d6bf85'
+         '6295a103438cace5c40606b083c739fd')

Added: disable-ms_abi-flag.patch
===================================================================
--- disable-ms_abi-flag.patch	                        (rev 0)
+++ disable-ms_abi-flag.patch	2012-11-12 13:58:45 UTC (rev 170835)
@@ -0,0 +1,16 @@
+diff --git a/Make.defaults b/Make.defaults
+index 38da180..aa1f4de 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -54,9 +54,9 @@ GCCNEWENOUGH := $(shell ([ $(GCCVERSION) -gt "4" ] || ([ $(GCCVERSION) -eq "4" ]
+ 
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+ ifeq ($(GCCNEWENOUGH),1)
+-CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args
++CPPFLAGS   += -maccumulate-outgoing-args
+ endif
+-CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
++CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-stack-protector -fno-merge-constants
+ ASFLAGS    = $(ARCH3264)
+ LDFLAGS	   = -nostdlib
+ INSTALL	   = install