summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2020-09-07 16:30:53 +0200
committerMarek Szuba <marecki@gentoo.org>2020-09-07 16:36:12 +0200
commit141f1b5254fdbb263ba1d3a5697da791f359ffc7 (patch)
tree2a620bb38f6c0bfb861fd9011f87f2fa637efe67
parentmedia-gfx/nvidia-texture-tools: fix test datapath handling (diff)
downloadgentoo-141f1b5254fdbb263ba1d3a5697da791f359ffc7.tar.gz
gentoo-141f1b5254fdbb263ba1d3a5697da791f359ffc7.tar.bz2
gentoo-141f1b5254fdbb263ba1d3a5697da791f359ffc7.zip
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 <marecki@gentoo.org>
-rw-r--r--net-misc/oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch18
1 files changed, 18 insertions, 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
index 0cdf44fba8c2..1441cdc13199 100644
--- 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