commit: c95d0ad1b89e7b7aab7859b0f0394110a30dbec0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jul 10 23:08:27 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jul 10 23:08:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95d0ad1
sys-block/libzbc: drop 5.5.1 Bug: https://bugs.gentoo.org/857462 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-block/libzbc/Manifest | 1 - sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch | 64 ---------------------- .../libzbc/files/libzbc-no-automagic-gtk-dep.patch | 29 ---------- sys-block/libzbc/libzbc-5.5.1.ebuild | 40 -------------- 4 files changed, 134 deletions(-) diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest index 223f12cb75df..8b58f5626601 100644 --- a/sys-block/libzbc/Manifest +++ b/sys-block/libzbc/Manifest @@ -1,2 +1 @@ -DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159 DIST libzbc-5.9.0.tar.gz 131517 BLAKE2B eb05214ffea376930f1b4327152da687067023eab929ed1db123ea3bc80e0f036dfbe9889da2707f1c3842120d4fc3b2c8ab471731d45d5483fe947c21fc7cad SHA512 bcdf294d86867736826af06ad6d18dec31630b3f5bc6e3e98c228bec6a30efcce76a27e3c66a08ce670614ca016dc079894320cff340bafe126fcb40973e8302 diff --git a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch b/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch deleted file mode 100644 index 78511bf521d2..000000000000 --- a/sys-block/libzbc/files/libzbc-5.5.1-gcc-10.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://github.com/hgst/libzbc/commit/1f3a63432bb5a4ca47a5839181c8f13512848b6c -https://bugs.gentoo.org/707808 - -From 1f3a63432bb5a4ca47a5839181c8f13512848b6c Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt <jeng...@inai.de> -Date: Mon, 16 Mar 2020 08:01:44 +0100 -Subject: [PATCH] build: avoid double definition of zbc_log_drv etc. - -When -fno-common is in use, what compiler writers are trying to make -a standard, libzbc fails to build. - -$ make V=1 -Making all in . -make[1]: Entering directory '~/libzbc' -/bin/sh ./libtool --tag=CC --mode=link gcc -fPIC -fno-common -O2 -g -pthread -Wl,--version-script,./exports -release '5.8.5' -o libzbc.la -rpath /usr/lib lib/libzbc_la-zbc.lo lib/libzbc_la-zbc_block.lo lib/libzbc_la-zbc_sg.lo lib/libzbc_la-zbc_scsi.lo lib/libzbc_la-zbc_ata.lo lib/libzbc_la-zbc_fake.lo -libtool: link: gcc -shared -fPIC -DPIC lib/.libs/libzbc_la-zbc.o lib/.libs/libzbc_la-zbc_block.o lib/.libs/libzbc_la-zbc_sg.o lib/.libs/libzbc_la-zbc_scsi.o lib/.libs/libzbc_la-zbc_ata.o lib/.libs/libzbc_la-zbc_fake.o -O2 -g -pthread -Wl,--version-script -Wl,./exports -pthread -Wl,-soname -Wl,libzbc-5.8.5.so -o .libs/libzbc-5.8.5.so -/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:269: multiple definition of `zbc_log_level'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:269: first defined here -/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:195: multiple definition of `zbc_fake_drv'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:195: first defined here - -References: https://bugzilla.suse.com/show_bug.cgi?id=1160244 ---- - lib/zbc.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/zbc.h b/lib/zbc.h -index 7dec298..73d76db 100644 ---- a/lib/zbc.h -+++ b/lib/zbc.h -@@ -177,22 +177,22 @@ static inline void zbc_set_errno(enum zbc_sk sk, enum zbc_asc_ascq asc_ascq) - /** - * Block device driver (requires kernel support). - */ --struct zbc_drv zbc_block_drv; -+extern struct zbc_drv zbc_block_drv; - - /** - * ZAC (ATA) device driver (uses SG_IO). - */ --struct zbc_drv zbc_ata_drv; -+extern struct zbc_drv zbc_ata_drv; - - /** - * ZBC (SCSI) device driver (uses SG_IO). - */ --struct zbc_drv zbc_scsi_drv; -+extern struct zbc_drv zbc_scsi_drv; - - /** - * ZBC emulation driver (file or block device). - */ --struct zbc_drv zbc_fake_drv; -+extern struct zbc_drv zbc_fake_drv; - - #define container_of(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) -@@ -266,7 +266,7 @@ enum { - /** - * Library log level. - */ --int zbc_log_level; -+extern int zbc_log_level; - - #define zbc_print(stream,format,args...) \ - do { \ diff --git a/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch b/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch deleted file mode 100644 index c6545033b435..000000000000 --- a/sys-block/libzbc/files/libzbc-no-automagic-gtk-dep.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 122fd22..5ab9783 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,10 +31,22 @@ AC_CHECK_HEADER(libgen.h, [], [AC_MSG_ERROR([Couldn't find libgen.h])]) - AC_CHECK_HEADERS([linux/fs.h linux/blkzoned.h]) - - # Conditionals -+AC_ARG_WITH([gtk3], -+ AS_HELP_STRING([--without-gtk3], [Do not build gzbc even if gtk3 is present])) -+ -+AS_IF([test "x$with_gtk3" != "xno"], -+ [PKG_CHECK_MODULES([GTK], [gtk+-3.0], [HAVE_GTK3=1], [HAVE_GTK3=0])], -+ [have_gtk3=no]) -+ -+AS_IF([test "x$with_gtk3" = "xyes"], -+ [PKG_CHECK_MODULES([GTK], [gtk+-3.0], [HAVE_GTK3=1], [HAVE_GTK3=0])], -+ [AS_IF([test "x$with_gtk3" = "xyes"], -+ [AC_MSG_ERROR([gtk3 requested but not found]) -+ ]) -+]) - - # Build gzbc only if GTK3 is installed. --PKG_CHECK_MODULES([GTK], [gtk+-3.0], [HAVE_GTK3=1], [HAVE_GTK3=0]) --AM_CONDITIONAL([BUILD_GZBC], [test "$HAVE_GTK3" -eq 1]) -+AM_CONDITIONAL([BUILD_GZBC], [test "$HAVE_GTK3" = 1]) - - # Build test suite - AC_ARG_WITH([test], diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild deleted file mode 100644 index cda85212ec9a..000000000000 --- a/sys-block/libzbc/libzbc-5.5.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A library and tools for working with ZBC and ZAC disks" -HOMEPAGE="https://github.com/hgst/libzbc"; -SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2 GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86" -IUSE="gtk" - -DEPEND="virtual/pkgconfig - >=sys-kernel/linux-headers-4.13 - gtk? ( x11-libs/gtk+:3 )" - -PATCHES=( - "${FILESDIR}/libzbc-no-automagic-gtk-dep.patch" - "${FILESDIR}/${P}-gcc-10.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with gtk gtk3) \ - --disable-static -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -}
