diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2023-03-27 21:08:51 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2023-03-27 21:18:30 +0100 |
| commit | e77818288c6c60aced72576c702e7b72f0362965 (patch) | |
| tree | 1b6fed488d49ff7ae368bbf9e3e558f282d28c6c | |
| parent | app-misc/jdupes: drop 1.21.0, 1.21.1 (diff) | |
| download | gentoo-e77818288c6c60aced72576c702e7b72f0362965.tar.gz gentoo-e77818288c6c60aced72576c702e7b72f0362965.tar.bz2 gentoo-e77818288c6c60aced72576c702e7b72f0362965.zip | |
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@gentoo.org>
| -rw-r--r-- | net-misc/oidc-agent/files/oidc-agent-4.4.0_deps-automagic.patch | 13 | ||||
| -rw-r--r-- | net-misc/oidc-agent/oidc-agent-4.5.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | 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 |