* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/
@ 2020-09-07 14:36 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-09-07 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 141f1b5254fdbb263ba1d3a5697da791f359ffc7
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 14:30:53 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 14:36:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=141f1b52
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 <AT> gentoo.org>
.../oidc-agent-3.3.1_makefile-toolchain-vars.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
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 0cdf44fba8c..1441cdc1319 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/
@ 2020-09-07 16:49 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-09-07 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 5f717280766c3995fa3b232a084c48c5a7c088ae
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 16:42:15 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 16:49:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f717280
net-misc/oidc-agent: respect CC while linking the shared library
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../oidc-agent/files/oidc-agent-3.3.1_makefile-toolchain-vars.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 1441cdc1319..dda1ab25221 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
@@ -42,7 +42,7 @@
@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
++ @$(LINKER) -shared -fpic -Wl,-soname,$(SONAME) $(LDFLAGS) -o $@ $(PIC_OBJECTS) -lc
endif
.PHONY: shared_lib
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-07 16:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-07 14:36 [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2020-09-07 16:49 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox