diff --git a/extra/efivar/build b/extra/efivar/build index 2b8f24e3..c390203b 100755 --- a/extra/efivar/build +++ b/extra/efivar/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < no-add-needed.patch + # Disable test program 'thread-test' as it causes build failures when using # parallel make (due to missing dependency on libefivar.so). Other workarounds # include patching the Makefile or forcing -j1 (what we used to do). diff --git a/extra/efivar/checksums b/extra/efivar/checksums index 04a0eb5c..133988e7 100644 --- a/extra/efivar/checksums +++ b/extra/efivar/checksums @@ -1 +1,2 @@ 016dfae596b691c8d38e488f8bfac3ba437befc260a6f32e60dd390595c9f3e9 +bad5af225196cccad29f488015399830a44de71bf955c5b29b432b68fe96083a diff --git a/extra/efivar/patches/no-add-needed.patch b/extra/efivar/patches/no-add-needed.patch new file mode 100644 index 00000000..bc5d205d --- /dev/null +++ b/extra/efivar/patches/no-add-needed.patch @@ -0,0 +1,30 @@ +diff --git a/src/include/defaults.mk b/src/include/defaults.mk +index 511f4da..3825ef0 100644 +--- a/src/include/defaults.mk ++++ b/src/include/defaults.mk +@@ -47,7 +47,6 @@ LDFLAGS ?= + override _CCLDFLAGS := $(CCLDFLAGS) + override _LDFLAGS := $(LDFLAGS) + override LDFLAGS = $(CFLAGS) -L. $(_LDFLAGS) $(_CCLDFLAGS) \ +- -Wl,--add-needed \ + -Wl,--build-id \ + -Wl,--no-allow-shlib-undefined \ + -Wl,--no-undefined-version \ +@@ -89,7 +88,6 @@ override _HOST_LDFLAGS := $(HOST_LDFLAGS) + override _HOST_CCLDFLAGS := $(HOST_CCLDFLAGS) + override HOST_LDFLAGS = $(HOST_CFLAGS) -L. \ + $(_HOST_LDFLAGS) $(_HOST_CCLDFLAGS) \ +- -Wl,--add-needed \ + -Wl,--build-id \ + -Wl,--no-allow-shlib-undefined \ + -Wl,-z,now \ +diff --git a/src/include/gcc.specs b/src/include/gcc.specs +index ef28e2b..d85e865 100644 +--- a/src/include/gcc.specs ++++ b/src/include/gcc.specs +@@ -5,4 +5,4 @@ + + %{!shared:%{!static:%{!r:-pie}}} %{static:-Wl,-no-fatal-warnings -Wl,-static -static -Wl,-z,relro,-z,now} -grecord-gcc-switches + + *link: +-+ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined --add-needed -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%