From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/
Date: Mon, 27 Mar 2023 20:18:40 +0000 (UTC) [thread overview]
Message-ID: <1679948310.e77818288c6c60aced72576c702e7b72f0362965.marecki@gentoo> (raw)
commit: e77818288c6c60aced72576c702e7b72f0362965
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 20:08:51 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 20:18:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7781828
net-misc/oidc-agent: drop the deps_automagic patch
The version compatible with 4.5.1 got left out of the version-bump
commit, and in general not needed if all USE_FOO_SO variables are
set by the ebuilds.
Closes: https://bugs.gentoo.org/902895
Signed-off-by: Marek Szuba <marecki <AT> 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 +-
net-misc/oidc-agent/oidc-agent-4.5.1.ebuild | 3 ++-
3 files changed, 3 insertions(+), 15 deletions(-)
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
deleted file mode 100644
index f8131d23bafa..000000000000
--- a/net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 459b2148429c..1899a1d911d2 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,7 +28,6 @@ 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
)
@@ -41,6 +40,7 @@ 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
diff --git a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
index 459b2148429c..d036c301e3b3 100644
--- a/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.5.1.ebuild
@@ -28,7 +28,6 @@ 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
)
@@ -41,6 +40,8 @@ src_prepare() {
src_compile() {
local -x USE_CJSON_SO=1
+ local -x USE_LIST_SO=0
+ local -x USE_MUSTACHE_SO=0
use elibc_musl && local -x USE_ARGP_SO=1
emake -j1 create_obj_dir_structure create_picobj_dir_structure # Bug #880157
emake
next reply other threads:[~2023-03-27 20:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-27 20:18 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-19 8:52 [gentoo-commits] repo/gentoo:master commit in: net-misc/oidc-agent/, net-misc/oidc-agent/files/ Marek Szuba
2023-03-27 20:18 Marek Szuba
2023-02-24 16:50 Marek Szuba
2022-07-12 22:20 Marek Szuba
2022-02-03 17:31 Marek Szuba
2021-12-15 13:23 Marek Szuba
2021-11-10 16:49 Marek Szuba
2021-03-11 10:26 Marek Szuba
2021-03-11 10:26 Marek Szuba
2020-09-23 12:02 Marek Szuba
2020-06-19 17:15 Marek Szuba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1679948310.e77818288c6c60aced72576c702e7b72f0362965.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox