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

[Tobias Powalowski]

    Date: Tuesday, February 26, 2013 @ 16:27:34
  Author: tpowa
Revision: 178731

upgpkg: gnu-efi-libs 3.0t-2

reenable disable_msabi patch

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

---------------------------+
 PKGBUILD                  |   10 ++++++----
 disable-ms_abi-flag.patch |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-26 15:27:34 UTC (rev 178730)
+++ PKGBUILD	2013-02-26 15:27:34 UTC (rev 178731)
@@ -6,7 +6,7 @@
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
 pkgver="${_pkgver}t"
-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,8 @@
 provides=('gnu-efi')
 replaces=('gnu-efi')
 options=('!strip' '!makeflags')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")         
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
+        'disable-ms_abi-flag.patch')         
 _build_gnu-efi-libs-x86_64() {	
 	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
 	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
@@ -37,7 +38,7 @@
 build() {
         cd ${srcdir}/gnu-efi-${_pkgver}
         # fix broken ms_abi flags, causing weird issues with bootloaders
-        # patch -Np1 -i ../disable-ms_abi-flag.patch
+        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
@@ -74,4 +75,5 @@
 		_package_gnu-efi-libs-i386
 	fi	
 }
-md5sums=('95916208cf543699799230ac1ea14272')
+md5sums=('95916208cf543699799230ac1ea14272'
+         '783755e5f691f4c5c629f94d759b727b')

Modified: disable-ms_abi-flag.patch
===================================================================
--- disable-ms_abi-flag.patch	2013-02-26 15:27:34 UTC (rev 178730)
+++ disable-ms_abi-flag.patch	2013-02-26 15:27:34 UTC (rev 178731)
@@ -6,8 +6,8 @@
  
  CPPFLAGS   = -DCONFIG_$(ARCH)
  ifeq ($(GCCNEWENOUGH),1)
--CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args
-+CPPFLAGS   += -maccumulate-outgoing-args
+-CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
++CPPFLAGS   += -maccumulate-outgoing-args --std=c11
  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