oasis

commit: 9c81417ff34ccee69f204cb328b39a2f4831e163
parent b1090608e6b566111b8ef190b3143d187da98cd8
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  5 Nov 2018 11:29:47 -0800

efivar: Use upstream solution for makeguids generics.h problem

Diffstat:
M
.gitmodules
1
+
M
pkg/efivar/gen.lua
6
+-----
A
pkg/efivar/patch/0001-Fix-a-makeguids-building-problem-with-generics.h.patch
34
++++++++++++++++++++++++++++++++++
M
pkg/efivar/rev
2
+-

4 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -40,6 +40,7 @@
 [submodule "pkg/efivar/src"]
 	path = pkg/efivar/src
 	url = https://github.com/rhinstaller/efivar
+	ignore=all
 [submodule "pkg/elfutils/src"]
 	path = pkg/elfutils/src
 	url = git://sourceware.org/git/elfutils.git
diff --git a/pkg/efivar/gen.lua b/pkg/efivar/gen.lua
@@ -19,11 +19,7 @@ sub('tools.ninja', function()
 		'-I $srcdir/src/include',
 	}
 	build('cc', '$outdir/host-guid.c.o', '$srcdir/src/guid.c')
-	exe('makeguids', {'src/makeguids.c', 'host-guid.c.o'}, nil, {
-		ldlibs='-ldl',
-		-- src/generics.h defines some static inline functions that refer to undefined symbols
-		ldflags='$ldflags -Wl,--unresolved-symbols=ignore-in-object-files',
-	})
+	exe('makeguids', {'src/makeguids.c', 'host-guid.c.o'}, nil, {ldlibs='-ldl'})
 end)
 
 rule('makeguids', '$outdir/makeguids $in $out')
diff --git a/pkg/efivar/patch/0001-Fix-a-makeguids-building-problem-with-generics.h.patch b/pkg/efivar/patch/0001-Fix-a-makeguids-building-problem-with-generics.h.patch
@@ -0,0 +1,34 @@
+From ca5794a4c375794c97cf3c185dda27529e5b3961 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 20 Jun 2018 14:12:42 -0400
+Subject: [PATCH] Fix a makeguids building problem with generics.h.
+
+Guard generics.h with EFIVAR_BUILD_ENVIRONMENT to keep it from
+interfering with the makeguids build if libefivar.so isn't around
+already.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/generics.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/generics.h b/src/generics.h
+index e6af2fa..66be4bd 100644
+--- a/src/generics.h
++++ b/src/generics.h
+@@ -17,6 +17,7 @@
+  *
+  */
+ 
++#ifndef EFIVAR_BUILD_ENVIRONMENT
+ #ifndef LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H
+ #define LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H 1
+ 
+@@ -182,3 +183,4 @@ generic_append_variable(efi_guid_t guid, const char *name,
+ }
+ 
+ #endif /* LIBEFIVAR_GENERIC_NEXT_VARIABLE_NAME_H */
++#endif /* EFIVAR_BUILD_ENVIRONMENT */
+-- 
+2.19.1
+
diff --git a/pkg/efivar/rev b/pkg/efivar/rev
@@ -1 +1 @@
-7
+8