net-misc/oidc-agent: fix LDFLAGS propagation

Upstream uses three different sets of linker flags: one for liboidc-agent.so (declared inline), one for oidc-token (CLIENT_LFLAGS) and one for everything else (LFLAGS). The previous version of the toolchain patch only injected LDFLAGS into the latter, hence QA warnings for the former two. Closes: https://bugs.gentoo.org/740778 Signed-off-by: Marek Szuba <[email protected]>
hanetzer · Sep 7, 2020 · 141f1b5 · 141f1b5
1 parent c5cc1ae
commit 141f1b5
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch
@@ -28,3 +28,21 @@
  endif
  ifdef HAS_CJSON
  LFLAGS += -lcjson
+@@ -81,7 +81,7 @@
+ ifdef MAC_OS
+ CLIENT_LFLAGS = -L$(APILIB) -largp -loidc-agent.$(LIBVERSION)
+ else
+-CLIENT_LFLAGS = -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
++CLIENT_LFLAGS = $(LDFLAGS) -L$(APILIB) -l:$(SHARED_LIB_NAME_FULL) -lseccomp
+ endif
+ ifdef HAS_CJSON
+ CLIENT_LFLAGS += -lcjson
+@@ -478,7 +478,7 @@
+ ifdef MAC_OS
+ @gcc -dynamiclib -fpic -Wl, -o $@ $(PIC_OBJECTS) -lc
+ else
+- @gcc -shared -fpic -Wl,-soname,$(SONAME) -o $@ $(PIC_OBJECTS) -lc
++ @gcc -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc
+ endif
+
+ .PHONY: shared_lib