From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D2671382C5 for ; Fri, 12 Mar 2021 16:14:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BD86E09CF; Fri, 12 Mar 2021 16:14:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34A32E09CF for ; Fri, 12 Mar 2021 16:14:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6767134085A for ; Fri, 12 Mar 2021 16:14:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2004F59B for ; Fri, 12 Mar 2021 16:14:34 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1615565661.1c409adcce61eab53a3398e9af5bd51c6fb4e953.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/files/, net-misc/oidc-agent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/oidc-agent/files/oidc-agent-4.0.2_makefile-liblist-automagic.patch net-misc/oidc-agent/oidc-agent-4.0.2.ebuild X-VCS-Directories: net-misc/oidc-agent/ net-misc/oidc-agent/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 1c409adcce61eab53a3398e9af5bd51c6fb4e953 X-VCS-Branch: master Date: Fri, 12 Mar 2021 16:14:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7c0960b-79eb-4dd1-af43-d711511fcd67 X-Archives-Hash: 99de81c8eb6453c087ac593a195c99ba commit: 1c409adcce61eab53a3398e9af5bd51c6fb4e953 Author: Marek Szuba gentoo org> AuthorDate: Fri Mar 12 15:57:10 2021 +0000 Commit: Marek Szuba gentoo 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 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