efivar: fix linking with alternative linkers.

This just removes --add-needed which was "temporarily" added to
the build proceess 6 years ago but seems to cause zero issues when
removed today(?).
This commit is contained in:
Dylan Araps 2021-08-15 08:59:15 +03:00
parent f54b67e702
commit 1f2467755a
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
4 changed files with 34 additions and 0 deletions

View File

@ -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).

View File

@ -1 +1,2 @@
016dfae596b691c8d38e488f8bfac3ba437befc260a6f32e60dd390595c9f3e9
bad5af225196cccad29f488015399830a44de71bf955c5b29b432b68fe96083a

View File

@ -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:%<pie}
++ %{!static:--fatal-warnings} --no-undefined-version --no-allow-shlib-undefined -z now --build-id %{!static:%{!shared:-pie}} %{shared:-z relro} %{static:%<pie}

View File

@ -1 +1,2 @@
https://github.com/rhboot/efivar/archive/VERSION.tar.gz
patches/no-add-needed.patch