diff options
author | 2025-01-06 21:22:47 -0500 | |
---|---|---|
committer | 2025-01-07 00:18:51 -0500 | |
commit | 4c742bca6704a1b931bb3730fb13188405c4b5fc (patch) | |
tree | 7c5be661cfeba973d94caa2adb6a771648d0092a /sys-block | |
parent | net-misc/ubridge: update for unslotted iniparser (diff) | |
download | gentoo-4c742bca6704a1b931bb3730fb13188405c4b5fc.tar.gz gentoo-4c742bca6704a1b931bb3730fb13188405c4b5fc.tar.bz2 gentoo-4c742bca6704a1b931bb3730fb13188405c4b5fc.zip |
sys-block/ndctl: update for unslotted iniparser
Older version with :0= seems to work with both 3 and 4, and the already
present binding operator will take care of rebuilds so leaving it alone.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'sys-block')
-rw-r--r-- | sys-block/ndctl/files/ndctl-77-iniparser4.patch | 19 | ||||
-rw-r--r-- | sys-block/ndctl/ndctl-77-r2.ebuild (renamed from sys-block/ndctl/ndctl-77-r1.ebuild) | 8 |
2 files changed, 2 insertions, 25 deletions
diff --git a/sys-block/ndctl/files/ndctl-77-iniparser4.patch b/sys-block/ndctl/files/ndctl-77-iniparser4.patch deleted file mode 100644 index 9df1782d51bd..000000000000 --- a/sys-block/ndctl/files/ndctl-77-iniparser4.patch +++ /dev/null @@ -1,19 +0,0 @@ -Adapt to dev-libs/iniparser being slotted in Gentoo. ---- a/meson.build -+++ b/meson.build -@@ -179,12 +179,12 @@ iniparser_headers = ['iniparser.h', 'dictionary.h'] - message('Looking for iniparser include headers', iniparser_headers) - - iniparserdir = include_directories(includedir / get_option('iniparserdir'), is_system:true) --iniparser = cc.find_library('iniparser', required : (get_option('iniparserdir') != '') , -+iniparser = cc.find_library('iniparser4', required : (get_option('iniparserdir') != '') , - has_headers :iniparser_headers ,header_include_directories : iniparserdir) - - if not iniparser.found() -- iniparserdir = include_directories(includedir / 'iniparser', is_system:true) -- iniparser = cc.find_library('iniparser', required : true, has_headers : iniparser_headers, -+ iniparserdir = include_directories(includedir / 'iniparser4', is_system:true) -+ iniparser = cc.find_library('iniparser4', required : true, has_headers : iniparser_headers, - header_include_directories : iniparserdir) - endif - iniparser = declare_dependency(include_directories: iniparserdir, dependencies:iniparser) diff --git a/sys-block/ndctl/ndctl-77-r1.ebuild b/sys-block/ndctl/ndctl-77-r2.ebuild index 09d4f90c5f84..8c808120df76 100644 --- a/sys-block/ndctl/ndctl-77-r1.ebuild +++ b/sys-block/ndctl/ndctl-77-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="amd64 ~x86" IUSE="doc libtracefs systemd test" DEPEND=" - dev-libs/iniparser:4= + >=dev-libs/iniparser-4.1-r2:= dev-libs/json-c:= sys-apps/keyutils:= sys-apps/kmod:= @@ -44,10 +44,6 @@ DOCS=( CONTRIBUTING.md ) -PATCHES=( - "${FILESDIR}"/${PN}-77-iniparser4.patch -) - src_configure() { local -a emesonargs=( $(meson_feature systemd) |