diff options
| author | Mark Weiman | 2016-07-23 11:08:41 -0400 |
|---|---|---|
| committer | Mark Weiman | 2016-07-23 11:08:41 -0400 |
| commit | 8448fae034e90bb905f4f295537b0c49bea5d268 (patch) | |
| tree | 6006f8c7c2766bd3f127946fa82baefcddeeeb4b | |
| parent | d440b0c8bfcf2f33c9a05b1a9e01fc7bb02ffb8d (diff) | |
| download | aur-8448fae034e90bb905f4f295537b0c49bea5d268.tar.gz | |
update (openssl 1.0.2h)
Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | gcc-6.0.patch | 11 |
3 files changed, 7 insertions, 26 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Fri May 20 17:30:52 UTC 2016 +# Sat Jul 23 15:08:36 UTC 2016 pkgbase = ovmf-git pkgdesc = UEFI Firmware (OVMF) with Secure Boot Support - for Virtual Machines (QEMU) - from Tianocore EDK2 - GIT Version pkgver = 18726.edddb94 @@ -19,16 +19,14 @@ pkgbase = ovmf-git conflicts = ovmf conflicts = ovmf-bin conflicts = ovmf-svn - noextract = openssl-1.0.2g.tar.gz + noextract = openssl-1.0.2h.tar.gz options = !strip options = docs options = !makeflags source = edk2::git+https://github.com/tianocore/edk2.git#branch=master - source = https://www.openssl.org/source/openssl-1.0.2g.tar.gz - source = gcc-6.0.patch + source = https://www.openssl.org/source/openssl-1.0.2h.tar.gz sha1sums = SKIP - sha1sums = 36af23887402a5ea4ebef91df8e61654906f58f2 - sha1sums = e90e571e5ee2456bbd4c6a90696d0f440d6a0f69 + sha1sums = 577585f5f5d299c44dd3c993d3c0ac7a219e4949 pkgname = ovmf-git @@ -20,7 +20,7 @@ _COMPILER="GCC49" ################ ################ -_OPENSSL_VERSION="1.0.2g" +_OPENSSL_VERSION="1.0.2h" ################ _pkgname="ovmf" @@ -43,12 +43,10 @@ provides=('ovmf' 'ovmf-bin' 'ovmf-svn') install="${_pkgname}.install" source=("${_TIANO_DIR_}::git+https://github.com/tianocore/edk2.git#branch=master" - "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz" - "gcc-6.0.patch") + "https://www.openssl.org/source/openssl-${_OPENSSL_VERSION}.tar.gz") sha1sums=('SKIP' - '36af23887402a5ea4ebef91df8e61654906f58f2' - 'e90e571e5ee2456bbd4c6a90696d0f440d6a0f69') + '577585f5f5d299c44dd3c993d3c0ac7a219e4949') noextract=("openssl-${_OPENSSL_VERSION}.tar.gz") @@ -129,10 +127,6 @@ _prepare_openssl_udk_dir() { } prepare() { - - # Fixes build when using gcc-6.0+ - patch -Np0 -i gcc-6.0.patch - _bail_out _setup_env_vars diff --git a/gcc-6.0.patch b/gcc-6.0.patch deleted file mode 100644 index 0b6fcddc3555..000000000000 --- a/gcc-6.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- edk2/OvmfPkg/build.sh.old 2016-05-20 13:19:44.721457791 -0400 -+++ edk2/OvmfPkg/build.sh 2016-05-20 13:18:36.334073093 -0400 -@@ -95,7 +95,7 @@ case `uname` in - 4.8.*) - TARGET_TOOLS=GCC48 - ;; -- 4.9.*|4.1[0-9].*|5.*.*) -+ 4.9.*|4.1[0-9].*|5.*.*|6.*.*) - TARGET_TOOLS=GCC49 - ;; - *) |