diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2023-03-27 22:41:09 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2023-03-27 22:43:18 +0100 |
| commit | 8ef39602837854caa38368d4ad5e48fafddf346d (patch) | |
| tree | 7128cd3864f25de5878df90611afc505b0584482 | |
| parent | dev-cpp/valijson: Stabilize 1.0 amd64, #903249 (diff) | |
| download | gentoo-8ef39602837854caa38368d4ad5e48fafddf346d.tar.gz gentoo-8ef39602837854caa38368d4ad5e48fafddf346d.tar.bz2 gentoo-8ef39602837854caa38368d4ad5e48fafddf346d.zip | |
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 <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 |
2 files changed, 14 insertions, 1 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 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 |