From 05e1f0704b932d860188f99bdae4c0791fe79d3848bc617e72d7c4d470986222 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 26 Sep 2014 09:49:13 +0000 Subject: [PATCH] Accepting request 252388 from home:gary_lin:branches:Base:System allow the EFI programs such as shim to use the external stdarg.h OBS-URL: https://build.opensuse.org/request/show/252388 OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=15 --- gnu-efi-allow-external-stdarg.patch | 42 +++++++++++++++++++++++++++++ gnu-efi.changes | 6 +++++ gnu-efi.spec | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 gnu-efi-allow-external-stdarg.patch diff --git a/gnu-efi-allow-external-stdarg.patch b/gnu-efi-allow-external-stdarg.patch new file mode 100644 index 0000000..8400952 --- /dev/null +++ b/gnu-efi-allow-external-stdarg.patch @@ -0,0 +1,42 @@ +From 6c10e225bc759d69af520a551b9d7b37f3ae0a82 Mon Sep 17 00:00:00 2001 +From: Nigel Croxon +Date: Mon, 25 Aug 2014 08:51:23 -0400 +Subject: [PATCH] From: David Decotigny Date: Thu, 31 Jul + 2014 18:19:16 -0700 Subject: [PATCH 5/5] allow to use external stdarg.h + +in cases we use gnu-efi together with other libs that define stdarg.h, +break the tie by telling gnu-efi to use that stdarg.h . + +Signed-off-by: David Decotigny +Signed-off-by: Nigel Croxon +--- + gnu-efi-3.0/inc/efistdarg.h | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/gnu-efi-3.0/inc/efistdarg.h b/gnu-efi-3.0/inc/efistdarg.h +index 440f9cd..bb04b31 100644 +--- a/gnu-efi-3.0/inc/efistdarg.h ++++ b/gnu-efi-3.0/inc/efistdarg.h +@@ -19,10 +19,15 @@ Revision History + + --*/ + ++#ifndef GNU_EFI_USE_EXTERNAL_STDARG + typedef __builtin_va_list va_list; + +-#define va_start(v,l) __builtin_va_start(v,l) +-#define va_end(v) __builtin_va_end(v) +-#define va_arg(v,l) __builtin_va_arg(v,l) +-#define va_copy(d,s) __builtin_va_copy(d,s) ++# define va_start(v,l) __builtin_va_start(v,l) ++# define va_end(v) __builtin_va_end(v) ++# define va_arg(v,l) __builtin_va_arg(v,l) ++# define va_copy(d,s) __builtin_va_copy(d,s) ++#else ++# include ++#endif ++ + #endif +-- +1.8.4.5 + diff --git a/gnu-efi.changes b/gnu-efi.changes index ac8f4a3..fd34d65 100644 --- a/gnu-efi.changes +++ b/gnu-efi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 26 02:41:54 UTC 2014 - glin@suse.com + +- Add gnu-efi-allow-external-stdarg.patch to allow the EFI programs + such as shim to use the external stdarg.h + ------------------------------------------------------------------- Mon Sep 22 08:56:19 UTC 2014 - glin@suse.com diff --git a/gnu-efi.spec b/gnu-efi.spec index ea42235..bfa1c56 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -26,6 +26,7 @@ Url: http://sourceforge.net/projects/gnu-efi Source: http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0w.orig.tar.gz Source1: %{name}-rpmlintrc Patch1: %{name}-build-fix.patch +Patch2: %{name}-allow-external-stdarg.patch BuildRequires: kernel-source BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 %ix86 x86_64 aarch64 @@ -43,6 +44,7 @@ Authors: %prep %setup -q -n gnu-efi-3.0 %patch1 -p1 +%patch2 -p2 %build ##########################