commit: 1c409adcce61eab53a3398e9af5bd51c6fb4e953 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Fri Mar 12 15:57:10 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Mar 12 16:14:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c409adc
net-misc/oidc-agent-4.0.2: do not autodetect liblist.so One, no automagic. Two, this picks up the library installed by dev-libs/liblist - which is NOT the correct one. Closes: https://bugs.gentoo.org/775494 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> .../files/oidc-agent-4.0.2_makefile-liblist-automagic.patch | 11 +++++++++++ net-misc/oidc-agent/oidc-agent-4.0.2.ebuild | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch new file mode 100644 index 00000000000..1e8765aef9d --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,7 @@ + + # USE_CJSON_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i libcjson >/dev/null && echo 1 || echo 0) + USE_CJSON_SO ?= 0 +-USE_LIST_SO ?= $(shell /sbin/ldconfig -N -v $(sed 's/:/ /g' <<< $LD_LIBRARY_PATH) 2>/dev/null | grep -i liblist >/dev/null && echo 1 || echo 0) ++USE_LIST_SO ?= 0 + + ifeq ($(USE_CJSON_SO),1) + DEFINE_USE_CJSON_SO = -DUSE_CJSON_SO diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild index 1bac67f225c..88d48a54d23 100644 --- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild @@ -25,9 +25,15 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-4.0.2_install-perms.patch + "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch "${FILESDIR}"/${PN}-4.0.2_makefile-toolchain-vars.patch ) +src_prepare() { + default + sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" +} + src_compile() { # As of 4.0.2 parallel building still doesn't work emake -j1
