| 1 |
commit: aa280b6373af57ead7b1044a5954695eb64c0fa9 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 30 19:09:43 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 30 19:12:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa280b63 |
| 7 |
|
| 8 |
sys-fs/zfs: sync changes to rc ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-fs/zfs/zfs-2.1.0_rc4.ebuild | 31 ++++++++++++++++++++++++++++--- |
| 14 |
1 file changed, 28 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/zfs/zfs-2.1.0_rc4.ebuild b/sys-fs/zfs/zfs-2.1.0_rc4.ebuild |
| 17 |
index d4e6a719e7d..4292b09c839 100644 |
| 18 |
--- a/sys-fs/zfs/zfs-2.1.0_rc4.ebuild |
| 19 |
+++ b/sys-fs/zfs/zfs-2.1.0_rc4.ebuild |
| 20 |
@@ -31,16 +31,16 @@ fi |
| 21 |
LICENSE="BSD-2 CDDL MIT" |
| 22 |
# just libzfs soname major for now. |
| 23 |
# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. |
| 24 |
+# see libsoversion_check() below as well |
| 25 |
SLOT="0/5" |
| 26 |
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs" |
| 27 |
+IUSE="custom-cflags debug kernel-builtin minimal nls pam python +rootfs test-suite static-libs" |
| 28 |
|
| 29 |
DEPEND=" |
| 30 |
net-libs/libtirpc[static-libs?] |
| 31 |
sys-apps/util-linux[static-libs?] |
| 32 |
sys-libs/zlib[static-libs(+)?] |
| 33 |
virtual/libudev[static-libs(-)?] |
| 34 |
- libressl? ( dev-libs/libressl:0=[static-libs?] ) |
| 35 |
- !libressl? ( dev-libs/openssl:0=[static-libs?] ) |
| 36 |
+ dev-libs/openssl:0=[static-libs?] |
| 37 |
!minimal? ( ${PYTHON_DEPS} ) |
| 38 |
pam? ( sys-libs/pam ) |
| 39 |
python? ( |
| 40 |
@@ -112,8 +112,33 @@ pkg_setup() { |
| 41 |
fi |
| 42 |
} |
| 43 |
|
| 44 |
+libsoversion_check() { |
| 45 |
+ |
| 46 |
+ local bugurl libzfs_sover |
| 47 |
+ bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" |
| 48 |
+ |
| 49 |
+ libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ |
| 50 |
+ | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" |
| 51 |
+ libzfs_sover="${libzfs_sover%%:*}" |
| 52 |
+ |
| 53 |
+ if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then |
| 54 |
+ echo |
| 55 |
+ eerror "BUG BUG BUG BUG BUG BUG BUG BUG" |
| 56 |
+ eerror "ebuild subslot does not match libzfs soversion!" |
| 57 |
+ eerror "libzfs soversion: ${libzfs_sover}" |
| 58 |
+ eerror "ebuild value: $(ver_cut 2 ${SLOT})" |
| 59 |
+ eerror "This is a bug in the ebuild, please use the following URL to report it" |
| 60 |
+ eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" |
| 61 |
+ echo |
| 62 |
+ # we want to abort for releases, but just print a warning for live ebuild |
| 63 |
+ # to keep package installable |
| 64 |
+ [[ ${PV} == "9999" ]] || die |
| 65 |
+ fi |
| 66 |
+} |
| 67 |
+ |
| 68 |
src_prepare() { |
| 69 |
default |
| 70 |
+ libsoversion_check |
| 71 |
|
| 72 |
if [[ ${PV} == "9999" ]]; then |
| 73 |
eautoreconf |
Archives