sys-fs/xfsprogs: Sync with Gentoo

It's from Gentoo commit a01ae94717841f74f5d7348cf809c99d31b8b09c.
This commit is contained in:
Flatcar Buildbot 2024-07-01 07:19:31 +00:00 committed by Mathieu Tortuyaux
parent ae0d2a3c28
commit a3594310ef
No known key found for this signature in database
GPG Key ID: AC5CCFB52545D9B8
5 changed files with 140 additions and 26 deletions

View File

@ -1,3 +1,4 @@
DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da
DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74 DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74
DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d

View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
inherit flag-o-matic systemd usr-ldscript toolchain-funcs inherit flag-o-matic systemd usr-ldscript
DESCRIPTION="XFS filesystem utilities" DESCRIPTION="XFS filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
@ -72,6 +72,8 @@ src_configure() {
local myconf=( local myconf=(
--enable-static --enable-static
--enable-blkid --enable-blkid
# Doesn't do anything beyond adding -flto (bug #930947).
--disable-lto
--with-crond-dir="${EPREFIX}/etc/cron.d" --with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
$(use_enable icu libicu) $(use_enable icu libicu)
@ -79,12 +81,6 @@ src_configure() {
$(use_enable libedit editline) $(use_enable libedit editline)
) )
if tc-is-lto ; then
myconf+=( --enable-lto )
else
myconf+=( --disable-lto )
fi
econf "${myconf[@]}" econf "${myconf[@]}"
} }

View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
inherit flag-o-matic systemd udev usr-ldscript toolchain-funcs inherit flag-o-matic systemd udev usr-ldscript
DESCRIPTION="XFS filesystem utilities" DESCRIPTION="XFS filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1" LICENSE="LGPL-2.1"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="icu libedit nls selinux" IUSE="icu libedit nls selinux"
RDEPEND=" RDEPEND="
@ -74,20 +74,16 @@ src_configure() {
local myconf=( local myconf=(
--enable-static --enable-static
--enable-blkid --enable-blkid
# Doesn't do anything beyond adding -flto (bug #930947).
--disable-lto
--with-crond-dir="${EPREFIX}/etc/cron.d" --with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
--with-udev-rule-dir="$(get_udevdir)" --with-udev-rule-dir="$(get_udevdir)/rules.d"
$(use_enable icu libicu) $(use_enable icu libicu)
$(use_enable nls gettext) $(use_enable nls gettext)
$(use_enable libedit editline) $(use_enable libedit editline)
) )
if tc-is-lto ; then
myconf+=( --enable-lto )
else
myconf+=( --disable-lto )
fi
econf "${myconf[@]}" econf "${myconf[@]}"
} }
@ -101,3 +97,11 @@ src_install() {
gen_usr_ldscript -a handle gen_usr_ldscript -a handle
} }
pkg_postrm() {
udev_reload
}
pkg_postinst() {
udev_reload
}

View File

@ -3,7 +3,7 @@
EAPI=8 EAPI=8
inherit flag-o-matic systemd udev usr-ldscript toolchain-funcs inherit flag-o-matic systemd udev
DESCRIPTION="XFS filesystem utilities" DESCRIPTION="XFS filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1" LICENSE="LGPL-2.1"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="icu libedit nls selinux" IUSE="icu libedit nls selinux static-libs"
RDEPEND=" RDEPEND="
dev-libs/inih dev-libs/inih
@ -71,20 +71,16 @@ src_configure() {
# https://www.spinics.net/lists/linux-xfs/msg30272.html # https://www.spinics.net/lists/linux-xfs/msg30272.html
local myconf=( local myconf=(
--enable-static --enable-static
# Doesn't do anything beyond adding -flto (bug #930947).
--disable-lto
--with-crond-dir="${EPREFIX}/etc/cron.d" --with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
--with-udev-rule-dir="$(get_udevdir)" --with-udev-rule-dir="$(get_udevdir)/rules.d"
$(use_enable icu libicu) $(use_enable icu libicu)
$(use_enable nls gettext) $(use_enable nls gettext)
$(use_enable libedit editline) $(use_enable libedit editline)
) )
if tc-is-lto ; then
myconf+=( --enable-lto )
else
myconf+=( --disable-lto )
fi
econf "${myconf[@]}" econf "${myconf[@]}"
} }
@ -93,8 +89,19 @@ src_compile() {
} }
src_install() { src_install() {
# XXX: There's a missing dep in the install-dev target, so split it
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
gen_usr_ldscript -a handle if ! use static-libs; then
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
fi
}
pkg_postrm() {
udev_reload
}
pkg_postinst() {
udev_reload
} }

View File

@ -0,0 +1,106 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic systemd udev
DESCRIPTION="XFS filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="icu libedit nls selinux static-libs"
RDEPEND="
dev-libs/inih
dev-libs/userspace-rcu:=
>=sys-apps/util-linux-2.17.2
icu? ( dev-libs/icu:= )
libedit? ( dev-libs/libedit )
"
DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
PATCHES=(
"${FILESDIR}"/${PN}-5.3.0-libdir.patch
)
src_prepare() {
default
# Fix doc dir
sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
include/builddefs.in || die
# Don't install compressed docs
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
}
src_configure() {
# include/builddefs.in will add FCFLAGS to CFLAGS which will
# unnecessarily clutter CFLAGS (and fortran isn't used)
unset FCFLAGS
# If set in user env, this breaks configure
unset PLATFORM
export DEBUG=-DNDEBUG
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
# However, we have to provide an empty value to avoid default
# flags.
export OPTIMIZER=" "
# Avoid automagic on libdevmapper (bug #709694)
export ac_cv_search_dm_task_create=no
# bug 903611
use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
# Build fails with -O3 (bug #712698)
replace-flags -O3 -O2
# Upstream does NOT support --disable-static anymore,
# https://www.spinics.net/lists/linux-xfs/msg30185.html
# https://www.spinics.net/lists/linux-xfs/msg30272.html
local myconf=(
--enable-static
# Doesn't do anything beyond adding -flto (bug #930947).
--disable-lto
--with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
--with-udev-rule-dir="$(get_udevdir)/rules.d"
$(use_enable icu libicu)
$(use_enable nls gettext)
$(use_enable libedit editline)
)
econf "${myconf[@]}"
}
src_compile() {
emake V=1
}
src_install() {
# XXX: There's a missing dep in the install-dev target, so split it
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
if ! use static-libs; then
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
fi
}
pkg_postrm() {
udev_reload
}
pkg_postinst() {
udev_reload
}