commit: 9d92a6f0bddaa8cb87fbad32caa69b9089905f55 Author: Joshua Kinard <kumba <AT> gentoo <DOT> org> AuthorDate: Wed Nov 11 21:59:25 2020 +0000 Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org> CommitDate: Wed Nov 11 22:00:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d92a6f0
sys-fs/zerofree: Fix musl compile error Added a patch to fix a compile error in musl environments and remove the older 1.0.4 ebuild. Closes: https://bugs.gentoo.org/712582 Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org> Package-Manager: Portage-3.0.9, Repoman-3.0.2 sys-fs/zerofree/Manifest | 1 - .../files/zerofree-include-sys_types.patch | 10 +++++++ sys-fs/zerofree/zerofree-1.0.4.ebuild | 35 ---------------------- sys-fs/zerofree/zerofree-1.1.1.ebuild | 5 ++++ 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest index 7c5efcfddaa..f646a814615 100644 --- a/sys-fs/zerofree/Manifest +++ b/sys-fs/zerofree/Manifest @@ -1,2 +1 @@ -DIST zerofree-1.0.4.tgz 8509 BLAKE2B d2d5872ad22e7c5f08e00083b0dadb5411023df9d129ec3bd08637e8a74f77f13a535e6f2c1a7cd4d390ed7a0d0b6e2433dacfa89336bb16ffb64c0d1c409929 SHA512 8172c8c43794eab1f751a700f847098343659ceabaf6ab78c3c902b34cf9b0db0dda75308b6bc80d22afccd11be25f35070ca6d715c3282c5c7c7106f598b42b DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c diff --git a/sys-fs/zerofree/files/zerofree-include-sys_types.patch b/sys-fs/zerofree/files/zerofree-include-sys_types.patch new file mode 100644 index 00000000000..fecdbd49b0a --- /dev/null +++ b/sys-fs/zerofree/files/zerofree-include-sys_types.patch @@ -0,0 +1,10 @@ +--- zerofree-1.1.1/zerofree.c.orig 2019-05-05 19:22:49.000000000 -0500 ++++ zerofree-1.1.1/zerofree.c 2019-05-05 19:21:50.000000000 -0500 +@@ -17,6 +17,7 @@ + * Jan Krämer. + */ + ++#include <sys/types.h> + #include <ext2fs/ext2fs.h> + #include <stdio.h> + #include <unistd.h> diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.0.4.ebuild deleted file mode 100644 index 6e360c833a1..00000000000 --- a/sys-fs/zerofree/zerofree-1.0.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils toolchain-funcs - -DESCRIPTION="Zeroes out all free space on a filesystem" -HOMEPAGE="http://frippery.org/uml/index.html"; -SRC_URI="http://frippery.org/uml/${P}.tgz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~x86" -IUSE="" - -DEPEND="sys-libs/e2fsprogs-libs" -RDEPEND="${DEPEND}" - -src_prepare() { - # Honor system CFLAGS. - # Use pipes for the sed delimiter to resolve #710818. - sed -i \ - -e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \ - -e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \ - -e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \ - Makefile || die "Failed to sed the Makefile" - - eapply_user -} - -src_install() { - # Install into /sbin - into / - dosbin zerofree -} diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild index 6e360c833a1..d234d5d2144 100644 --- a/sys-fs/zerofree/zerofree-1.1.1.ebuild +++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild @@ -17,6 +17,11 @@ DEPEND="sys-libs/e2fsprogs-libs" RDEPEND="${DEPEND}" src_prepare() { + default + + # Bug #712582, fix compile in musl environments. + eapply "${FILESDIR}/${PN}-include-sys_types.patch" + # Honor system CFLAGS. # Use pipes for the sed delimiter to resolve #710818. sed -i \
