mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 19:42:15 +02:00
sys-fs/xfsprogs: Sync with Gentoo
It's from Gentoo commit 6b2c89b214263c2b2591e96bbe490d46c66af769.
This commit is contained in:
Flatcar Buildbot
parent
75a2472803
commit
581b672105
@ -1,6 +1,4 @@
|
||||
DIST xfsprogs-6.10.1.tar.xz 1449932 BLAKE2B e9ed15b2d4a9026e0079adfb38578721e13498290a5d9590edae1fd41c9ee0338f9b823568677394952709d82bdc8ade36905a2266ffe64803901adbadfa5643 SHA512 b9fd7b7eaf038772ee4a9602bf38f714db7077731ec8904e0959d28b0103d443be8ae67720869012b90737c1ff440fbce44b3b23b662939c9a90c6d3be3fab08
|
||||
DIST xfsprogs-6.11.0.tar.xz 1457084 BLAKE2B 846b25ad36477d71f8f2091ad16699356416f09befbb4250335081d2a8fd78011e9100fbabfb727acdb65520a38c912d9bb9e33b17c222c97de88fd00ab004a9 SHA512 209b479e510e5d5c558430b523bebd90f34b2effeac46f783aad4ec45a9f39998ca1efc67155c54c22e778859968f4b275b0ca6f225603f17ae4cc5c7596a4ca
|
||||
DIST xfsprogs-6.12.0.tar.xz 1471672 BLAKE2B 471832b07bc2cca5bde6e1ac253d151b0889f7b7be75ae322727299a83329899d4c3aac8217b069fee3f7abc6bc964127c35a206b04cb796999497f5ad701f44 SHA512 020810b4a261f4ab4eb94aae813f22b26bb9f17705967198189509e684422361dd80af938e4a77cf326353d5d61d5aeaaee9a34e8a7b8ed1dddd63b7ad1b0510
|
||||
DIST xfsprogs-6.13.0.tar.xz 1506676 BLAKE2B 98a8b51ba7fb7f58ea292e9c4624ca3c2337d962f832d92549763a85036b8ba0579de0d172465227eb51cc5c51e3b5d4f54144690001ea8b6795b3a43bc41b9b SHA512 9fd73c8585cd295b79b227cd5855407da4b3ea2d40a1ca82e0a93887644b497cced182960bcd8f3c45805dda4a244d1555fd49da5d7e82fe4525d345c766a63a
|
||||
DIST xfsprogs-6.14.0.tar.xz 1543640 BLAKE2B 5ef446b2055356627cd91ebfe9bb07388f9b5a12fd8c530b83980261b2dc3ddfa47f809114f0f238ef787ed687d324abe82427fdc2b3ecc3171d4d06615dd0c4 SHA512 249a64fb5a92ceb9e58b75a270a90773cfe2c90e863d3f9853c14b3eb0f414bf55b8b67c220a1d7386894ef9295622e224977bd3c6600c9dcba826cb4a634f49
|
||||
DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d
|
||||
DIST xfsprogs-6.15.0.tar.xz 1550568 BLAKE2B fe6806ac8235c0984055f7b969b11bc0c49ee8bb8f49f7a4c3bf03f1ebf839cccb86cdb6c4946723a1b8007422e057fb7b865cc60081037920e8208cfcab16e9 SHA512 975c9c7fe476b02da50da74eb599f804f2b27a638a74b807e1f69d93d0d150d19bf6d5036601b96febe557a6c51065d8cf22eef5fda92a6d7f084ac1d7647496
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
In Gentoo we install libs to /usr/lib* and let gen_usr_ldscript
|
||||
handle /lib*.
|
||||
|
||||
--- a/include/buildmacros
|
||||
+++ b/include/buildmacros
|
||||
@@ -57,9 +57,10 @@ endif
|
||||
ifeq ($(ENABLE_SHARED),yes)
|
||||
INSTALL_LTLIB = \
|
||||
cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
|
||||
- ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
|
||||
- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
|
||||
+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \
|
||||
+ ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR)
|
||||
endif
|
||||
|
||||
# Libtool thinks the static and shared libs should be in the same dir, so
|
||||
@@ -68,7 +69,7 @@ endif
|
||||
# Other things want the shared libs to appear in /usr/lib, else they'll
|
||||
# link with the static libs there. So, another symlink to get the .so into
|
||||
# /usr/lib.
|
||||
-ifeq ($(ENABLE_SHARED),yes)
|
||||
+ifeq ($(ENABLE_SHARED_HANDLED_BY_gen_usr_ldscript),yes)
|
||||
INSTALL_LTLIB_DEV = \
|
||||
cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||
../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
|
||||
@ -1,110 +0,0 @@
|
||||
# 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 ~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 )"
|
||||
|
||||
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
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--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
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -11,7 +11,7 @@ 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
@ -21,7 +21,10 @@ RDEPEND="
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
@ -55,8 +58,9 @@ src_configure() {
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611
|
||||
use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
|
||||
# bug 903611, 948468
|
||||
use elibc_musl && \
|
||||
append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
@ -1,106 +0,0 @@
|
||||
# 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 ~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
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user