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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D27C15864F for ; Mon, 27 Mar 2023 21:43:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCC2BE0829; Mon, 27 Mar 2023 21:43:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D239E0829 for ; Mon, 27 Mar 2023 21:43:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 620A2340F15 for ; Mon, 27 Mar 2023 21:43:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7D828E5 for ; Mon, 27 Mar 2023 21:43:24 +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: <1679953398.8ef39602837854caa38368d4ad5e48fafddf346d.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.4.0_deps-automagic.patch net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild X-VCS-Directories: net-misc/oidc-agent/files/ net-misc/oidc-agent/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 8ef39602837854caa38368d4ad5e48fafddf346d X-VCS-Branch: master Date: Mon, 27 Mar 2023 21:43:24 +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: f5d7101d-bedd-40df-8364-918cd13b9584 X-Archives-Hash: b1cca9bf645b01f7dc50b6c5d7980bcf commit: 8ef39602837854caa38368d4ad5e48fafddf346d Author: Marek Szuba gentoo org> AuthorDate: Mon Mar 27 21:41:09 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Mon Mar 27 21:43:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef39602 net-misc/oidc-agent: restore the deps_automagic patch for 4.5.0 Odd issues observed afterwards. Let's leave this one as it was before and only make changes in 4.5.1+. Signed-off-by: Marek Szuba gentoo.org> .../oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch | 13 +++++++++++++ net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch b/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch new file mode 100644 index 000000000000..f8131d23bafa --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch @@ -0,0 +1,13 @@ +--- a/Makefile ++++ b/Makefile +@@ -78,8 +78,8 @@ + TESTSRCDIR = test/src + TESTBINDIR = test/bin + +-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_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_CJSON_SO ?= 0 ++USE_LIST_SO ?= 0 + USE_ARGP_SO ?= 0 + + ifeq ($(USE_CJSON_SO),1) diff --git a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild index ac7f0f17baf5..3b4667ef6d70 100644 --- a/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild @@ -28,6 +28,7 @@ BDEPEND="test? ( dev-libs/check )" RESTRICT="!test? ( test )" PATCHES=( + "${FILESDIR}"/${PN}-4.4.0_deps-automagic.patch "${FILESDIR}"/${PN}-4.4.0_install-perms.patch "${FILESDIR}"/${PN}-4.5.0_webkit41.patch ) @@ -40,7 +41,6 @@ src_prepare() { src_compile() { local -x USE_CJSON_SO=1 - local -x USE_LIST_SO=0 use elibc_musl && local -x USE_ARGP_SO=1 emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157 emake