From f6ff8ee1f9b12489d0e44ec51a493c4f58621b4d Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 10 Aug 2018 17:58:31 -0700 Subject: efivar: Update to 36 --- pkg/efivar/gen.lua | 13 +++++++++++-- pkg/efivar/rev | 2 +- pkg/efivar/src | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkg/efivar/gen.lua b/pkg/efivar/gen.lua index 67edcd81..6fb7aa2a 100644 --- a/pkg/efivar/gen.lua +++ b/pkg/efivar/gen.lua @@ -19,7 +19,11 @@ 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'}) + 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', + }) end) rule('makeguids', '$outdir/makeguids $in $out') @@ -42,7 +46,12 @@ pkg.hdrs = { } pkg.deps = {'$outdir/include/efivar/efivar-guids.h'} -lib('libefiboot.a', 'src/(crc32.c creator.c disk.c gpt.c linux.c loadopt.c)') +lib('libefiboot.a', [[ + src/( + crc32.c creator.c disk.c gpt.c loadopt.c path-helpers.c linux.c + linux-(ata i2o nvme pci pmem sas sata scsi virtblk).c + ) +]]) lib('libefivar.a', [[ src/( dp.c dp-acpi.c dp-hw.c dp-media.c dp-message.c diff --git a/pkg/efivar/rev b/pkg/efivar/rev index 1e8b3149..7f8f011e 100644 --- a/pkg/efivar/rev +++ b/pkg/efivar/rev @@ -1 +1 @@ -6 +7 diff --git a/pkg/efivar/src b/pkg/efivar/src index 67e36024..ef344922 160000 --- a/pkg/efivar/src +++ b/pkg/efivar/src @@ -1 +1 @@ -Subproject commit 67e3602495d2cbca02dcb6c302fd0bce48de6c42 +Subproject commit ef3449223ecd1e7b1098c523d66b2f960fe839ea -- cgit v1.2.3