summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeshav Amburay2013-06-13 10:26:02 +0530
committerKeshav Amburay2013-06-13 10:26:02 +0530
commit744c9c3e0abe031af1b0d0a53569829449a6bafd (patch)
tree5038dc0828d143604ef8ea9411a0981eb5a55295
parent0414b963e2b1b9b11de335e386e70f794a586585 (diff)
downloadaur-744c9c3e0abe031af1b0d0a53569829449a6bafd.tar.gz
Fix patch
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--gnu-efi-disable-use_ms_abi.patch6
3 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e1658af01456..8e00c448f07f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,7 @@ pkgbase = gnu-efi-libs-git
source = gnu-efi::git+git://git.code.sf.net/p/gnu-efi/code#branch=master
source = gnu-efi-disable-use_ms_abi.patch
sha1sums = SKIP
- sha1sums = e9f2c6cc7414b021cd3297791f911f721f120afa
+ sha1sums = 387ac12c85d8b94235d5ec27944e447de4fe0140
pkgname = gnu-efi-libs-git
diff --git a/PKGBUILD b/PKGBUILD
index 9526abeffb01..f87531349e28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}"
'gnu-efi-disable-use_ms_abi.patch')
sha1sums=('SKIP'
- 'e9f2c6cc7414b021cd3297791f911f721f120afa')
+ '387ac12c85d8b94235d5ec27944e447de4fe0140')
pkgver() {
cd "${srcdir}/${_gitname}/"
@@ -81,7 +81,7 @@ build() {
cd "${srcdir}/${_gitname}_build/${_src_rootdir}/"
## Disable ms_abi in gnu-efi Makefiles
- patch -Np1 -i "${srcdir}/gnu-efi-disable-use_ms_abi.patch"
+ # patch -Np1 -i "${srcdir}/gnu-efi-disable-use_ms_abi.patch"
echo
if [[ "${CARCH}" == "x86_64" ]]; then
diff --git a/gnu-efi-disable-use_ms_abi.patch b/gnu-efi-disable-use_ms_abi.patch
index dbb48d3f892c..531a23c62b13 100644
--- a/gnu-efi-disable-use_ms_abi.patch
+++ b/gnu-efi-disable-use_ms_abi.patch
@@ -1,7 +1,7 @@
-diff --git a/gnu-efi-3.0/Make.defaults b/gnu-efi-3.0/Make.defaults
+diff --git a/Make.defaults b/Make.defaults
index a22a1b4..4c95e7b 100644
---- a/gnu-efi-3.0/Make.defaults
-+++ b/gnu-efi-3.0/Make.defaults
+--- a/Make.defaults
++++ b/Make.defaults
@@ -83,7 +83,7 @@ GCCNEWENOUGH := $(shell ( [ $(GCCVERSION) -gt "4" ] \
&& [ $(GCCMINOR) -ge "7" ] ) ) \
&& echo 1)