mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-07 18:31:54 +01:00
bump(sys-fs/e2fsprogs): sync with upstream
This commit is contained in:
Benjamin Gilbert
Kai Lüke
parent
58410bf398
commit
80e3e9a338
@ -1,5 +1,4 @@
|
||||
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
|
||||
DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
|
||||
DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
|
||||
DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
|
||||
DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
|
||||
DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
|
||||
DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
|
||||
DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
|
||||
|
||||
@ -1,135 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
case ${PV} in
|
||||
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
|
||||
*) UP_PV=${PV} ;;
|
||||
esac
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
|
||||
mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
|
||||
elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
|
||||
|
||||
LICENSE="GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="fuse nls static-libs elibc_FreeBSD"
|
||||
|
||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
||||
>=sys-apps/util-linux-2.16
|
||||
fuse? ( sys-fs/fuse:0 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
sys-apps/texinfo"
|
||||
|
||||
S="${WORKDIR}/${P%_pre*}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.41.8-makefile.patch
|
||||
"${FILESDIR}"/${PN}-1.40-fbsd.patch
|
||||
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
|
||||
|
||||
# Upstream patches (can usually removed with next version bump)
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${CHOST} == *-mint* ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
# blargh ... trick e2fsprogs into using e2fsprogs-libs
|
||||
rm -rf doc
|
||||
sed -i -r \
|
||||
-e 's:@LIBINTL@:@LTLIBINTL@:' \
|
||||
-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
|
||||
-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
|
||||
MCONFIG.in || die "muck libs" #122368
|
||||
sed -i -r \
|
||||
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
|
||||
Makefile.in || die "remove subdirs"
|
||||
ln -s $(which mk_cmds) lib/ss/ || die
|
||||
|
||||
# Avoid rebuild
|
||||
echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Keep the package from doing silly things #261411
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
|
||||
# needs open64() prototypes and friends
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
|
||||
local myeconfargs=(
|
||||
--with-root-prefix="${EPREFIX}/"
|
||||
--enable-symlink-install
|
||||
$(tc-is-static-only || echo --enable-elf-shlibs)
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
--without-included-gettext
|
||||
$(use_enable fuse fuse2fs)
|
||||
$(use_enable nls)
|
||||
--disable-libblkid
|
||||
--disable-libuuid
|
||||
--disable-fsck
|
||||
--disable-uuidd
|
||||
)
|
||||
ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
|
||||
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
|
||||
eerror "INTL sanity check failed, aborting build."
|
||||
eerror "Please post your ${S}/config.log file as an"
|
||||
eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
|
||||
die "Preventing included intl cruft from building"
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
|
||||
|
||||
# Build the FreeBSD helper
|
||||
if use elibc_FreeBSD ; then
|
||||
cp "${FILESDIR}"/fsck_ext2fs.c .
|
||||
emake V=1 fsck_ext2fs
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# need to set root_libdir= manually as any --libdir options in the
|
||||
# econf above (i.e. multilib) will screw up the default #276465
|
||||
emake \
|
||||
STRIP=: \
|
||||
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D}" \
|
||||
install install-libs
|
||||
dodoc README RELEASE-NOTES
|
||||
|
||||
insinto /etc
|
||||
doins "${FILESDIR}"/e2fsck.conf
|
||||
|
||||
# Move shared libraries to /lib/, install static libraries to
|
||||
# /usr/lib/, and install linker scripts to /usr/lib/.
|
||||
gen_usr_ldscript -a e2p ext2fs
|
||||
# configure doesn't have an option to disable static libs :/
|
||||
use static-libs || find "${D}" -name '*.a' -delete
|
||||
|
||||
if use elibc_FreeBSD ; then
|
||||
# Install helpers for us
|
||||
into /
|
||||
dosbin "${S}"/fsck_ext2fs
|
||||
doman "${FILESDIR}"/fsck_ext2fs.8
|
||||
|
||||
# filefrag is linux only
|
||||
rm \
|
||||
"${ED%/}"/usr/sbin/filefrag \
|
||||
"${ED%/}"/usr/share/man/man8/filefrag.8 || die
|
||||
fi
|
||||
}
|
||||
@ -1,32 +1,34 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic multilib toolchain-funcs
|
||||
inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
|
||||
|
||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
|
||||
mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
|
||||
elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
|
||||
|
||||
LICENSE="GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="fuse nls static-libs elibc_FreeBSD"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="cron fuse nls static-libs elibc_FreeBSD"
|
||||
|
||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
||||
>=sys-apps/util-linux-2.16
|
||||
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
|
||||
fuse? ( sys-fs/fuse:0 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
sys-apps/texinfo"
|
||||
sys-apps/texinfo
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.41.8-makefile.patch
|
||||
"${FILESDIR}"/${PN}-1.40-fbsd.patch
|
||||
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
|
||||
|
||||
@ -40,8 +42,6 @@ src_prepare() {
|
||||
|
||||
default
|
||||
|
||||
eapply -R "${FILESDIR}"/${PN}-1.44.4-fix_make_install_for_subset.patch
|
||||
|
||||
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
|
||||
|
||||
# Get rid of doc -- we don't use them. This also prevents a sandbox
|
||||
@ -71,7 +71,10 @@ src_configure() {
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
|
||||
local myeconfargs=(
|
||||
--with-root-prefix="${EPREFIX%/}/"
|
||||
--with-root-prefix="${EPREFIX}"
|
||||
$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
|
||||
--enable-symlink-install
|
||||
--enable-elf-shlibs
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
@ -108,9 +111,9 @@ src_install() {
|
||||
# econf above (i.e. multilib) will screw up the default #276465
|
||||
emake \
|
||||
STRIP=: \
|
||||
root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D%/}" \
|
||||
install install-libs
|
||||
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
|
||||
einstalldocs
|
||||
|
||||
@ -134,7 +137,7 @@ src_install() {
|
||||
|
||||
# filefrag is linux only
|
||||
rm \
|
||||
"${ED%/}"/usr/sbin/filefrag \
|
||||
"${ED%/}"/usr/share/man/man8/filefrag.8 || die
|
||||
"${ED}"/usr/sbin/filefrag \
|
||||
"${ED}"/usr/share/man/man8/filefrag.8 || die
|
||||
fi
|
||||
}
|
||||
@ -1,39 +1,34 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
case ${PV} in
|
||||
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
|
||||
*) UP_PV=${PV} ;;
|
||||
esac
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
|
||||
|
||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
|
||||
mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
|
||||
elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
|
||||
|
||||
LICENSE="GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="fuse nls static-libs elibc_FreeBSD"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="cron fuse nls static-libs elibc_FreeBSD"
|
||||
|
||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
||||
>=sys-apps/util-linux-2.16
|
||||
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
|
||||
fuse? ( sys-fs/fuse:0 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
sys-apps/texinfo"
|
||||
|
||||
S="${WORKDIR}/${P%_pre*}"
|
||||
sys-apps/texinfo
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.41.8-makefile.patch
|
||||
"${FILESDIR}"/${PN}-1.40-fbsd.patch
|
||||
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
|
||||
|
||||
@ -47,8 +42,13 @@ src_prepare() {
|
||||
|
||||
default
|
||||
|
||||
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
|
||||
|
||||
# Get rid of doc -- we don't use them. This also prevents a sandbox
|
||||
# violation due to mktexfmt invocation
|
||||
rm -r doc || die "Failed to remove doc dir"
|
||||
|
||||
# blargh ... trick e2fsprogs into using e2fsprogs-libs
|
||||
rm -rf doc
|
||||
sed -i -r \
|
||||
-e 's:@LIBINTL@:@LTLIBINTL@:' \
|
||||
-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
|
||||
@ -71,9 +71,12 @@ src_configure() {
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
|
||||
local myeconfargs=(
|
||||
--with-root-prefix="${EPREFIX}/"
|
||||
--with-root-prefix="${EPREFIX}"
|
||||
$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
|
||||
--enable-symlink-install
|
||||
$(tc-is-static-only || echo --enable-elf-shlibs)
|
||||
--enable-elf-shlibs
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
--without-included-gettext
|
||||
$(use_enable fuse fuse2fs)
|
||||
@ -84,6 +87,7 @@ src_configure() {
|
||||
--disable-uuidd
|
||||
)
|
||||
ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
|
||||
|
||||
if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
|
||||
eerror "INTL sanity check failed, aborting build."
|
||||
eerror "Please post your ${S}/config.log file as an"
|
||||
@ -109,8 +113,9 @@ src_install() {
|
||||
STRIP=: \
|
||||
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D}" \
|
||||
install install-libs
|
||||
dodoc README RELEASE-NOTES
|
||||
install
|
||||
|
||||
einstalldocs
|
||||
|
||||
insinto /etc
|
||||
doins "${FILESDIR}"/e2fsck.conf
|
||||
@ -118,9 +123,10 @@ src_install() {
|
||||
# Move shared libraries to /lib/, install static libraries to
|
||||
# /usr/lib/, and install linker scripts to /usr/lib/.
|
||||
gen_usr_ldscript -a e2p ext2fs
|
||||
|
||||
# configure doesn't have an option to disable static libs :/
|
||||
if ! use static-libs ; then
|
||||
find "${D}" -name '*.a' -delete || die
|
||||
find "${ED}" -name '*.a' -delete || die
|
||||
fi
|
||||
|
||||
if use elibc_FreeBSD ; then
|
||||
@ -131,7 +137,7 @@ src_install() {
|
||||
|
||||
# filefrag is linux only
|
||||
rm \
|
||||
"${ED%/}"/usr/sbin/filefrag \
|
||||
"${ED%/}"/usr/share/man/man8/filefrag.8 || die
|
||||
"${ED}"/usr/sbin/filefrag \
|
||||
"${ED}"/usr/share/man/man8/filefrag.8 || die
|
||||
fi
|
||||
}
|
||||
@ -1,32 +1,34 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic multilib toolchain-funcs
|
||||
inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
|
||||
|
||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
|
||||
mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
|
||||
elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
|
||||
|
||||
LICENSE="GPL-2 BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="fuse nls static-libs elibc_FreeBSD"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="cron fuse nls static-libs elibc_FreeBSD"
|
||||
|
||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
||||
>=sys-apps/util-linux-2.16
|
||||
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
|
||||
fuse? ( sys-fs/fuse:0 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
sys-apps/texinfo"
|
||||
sys-apps/texinfo
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.41.8-makefile.patch
|
||||
"${FILESDIR}"/${PN}-1.40-fbsd.patch
|
||||
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
|
||||
|
||||
@ -69,7 +71,10 @@ src_configure() {
|
||||
append-cppflags -D_GNU_SOURCE
|
||||
|
||||
local myeconfargs=(
|
||||
--with-root-prefix="${EPREFIX%/}/"
|
||||
--with-root-prefix="${EPREFIX}"
|
||||
$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
|
||||
--enable-symlink-install
|
||||
--enable-elf-shlibs
|
||||
$(tc-has-tls || echo --disable-tls)
|
||||
@ -106,9 +111,9 @@ src_install() {
|
||||
# econf above (i.e. multilib) will screw up the default #276465
|
||||
emake \
|
||||
STRIP=: \
|
||||
root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D%/}" \
|
||||
install install-libs
|
||||
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
DESTDIR="${D}" \
|
||||
install
|
||||
|
||||
einstalldocs
|
||||
|
||||
@ -121,7 +126,7 @@ src_install() {
|
||||
|
||||
# configure doesn't have an option to disable static libs :/
|
||||
if ! use static-libs ; then
|
||||
find "${D}" -name '*.a' -delete || die
|
||||
find "${ED}" -name '*.a' -delete || die
|
||||
fi
|
||||
|
||||
if use elibc_FreeBSD ; then
|
||||
@ -132,7 +137,7 @@ src_install() {
|
||||
|
||||
# filefrag is linux only
|
||||
rm \
|
||||
"${ED%/}"/usr/sbin/filefrag \
|
||||
"${ED%/}"/usr/share/man/man8/filefrag.8 || die
|
||||
"${ED}"/usr/sbin/filefrag \
|
||||
"${ED}"/usr/share/man/man8/filefrag.8 || die
|
||||
fi
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
--- e2fsprogs-1.41.5/Makefile.in
|
||||
+++ e2fsprogs-1.41.5/Makefile.in
|
||||
@@ -281,6 +66,7 @@
|
||||
uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
|
||||
|
||||
install-libs: install-libs-recursive
|
||||
+install-libs-recursive: | install-shlibs-libs-recursive
|
||||
|
||||
uninstall-libs: uninstall-libs-recursive
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
From ed07fd93056a2d2c03affe3255d3d5747deaab21 Mon Sep 17 00:00:00 2001
|
||||
From: Theodore Ts'o <tytso@mit.edu>
|
||||
Date: Wed, 22 Aug 2018 13:42:23 -0400
|
||||
Subject: Fix "make install" for configure --enable-subset
|
||||
|
||||
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||
---
|
||||
Makefile.in | 24 ++++++++++++++----------
|
||||
1 file changed, 14 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 745e8590..80ab2994 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -42,7 +42,7 @@ subs: $(DEP_SUBSTITUTE)
|
||||
|
||||
progs: all-progs-recursive
|
||||
libs: all-libs-recursive
|
||||
-all-progs-recursive all-libs-recursive: subs
|
||||
+all-progs-recursive all-libs-recursive:: subs
|
||||
|
||||
rpm:
|
||||
sh contrib/build-rpm
|
||||
@@ -91,19 +91,23 @@ TAGS clean-recursive distclean-recursive depend-recursive fullcheck-recursive \
|
||||
done
|
||||
|
||||
all-progs-recursive install-progs-recursive install-strip-progs-recursive \
|
||||
- uninstall-progs-recursive coverage.txt-progs-recursive: all-libs-recursive
|
||||
- @for subdir in $(PROG_SUBDIRS); do \
|
||||
- if test -d $$subdir ; then \
|
||||
- target=`echo $@|$(SED) 's/-progs-recursive//'`; \
|
||||
- echo making $$target in $$subdir; \
|
||||
- (cd $$subdir && $(MAKE) $$target) || exit 1; \
|
||||
- fi ; \
|
||||
- done
|
||||
+ uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
|
||||
+
|
||||
+
|
||||
+@ALL_CMT@all-progs-recursive install-progs-recursive install-strip-progs-recursive \
|
||||
+@ALL_CMT@ uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
|
||||
+@ALL_CMT@ @for subdir in $(PROG_SUBDIRS); do \
|
||||
+@ALL_CMT@ if test -d $$subdir ; then \
|
||||
+@ALL_CMT@ target=`echo $@|$(SED) 's/-progs-recursive//'`; \
|
||||
+@ALL_CMT@ echo making $$target in $$subdir; \
|
||||
+@ALL_CMT@ (cd $$subdir && $(MAKE) $$target) || exit 1; \
|
||||
+@ALL_CMT@ fi ; \
|
||||
+@ALL_CMT@ done
|
||||
|
||||
all-libs-recursive install-libs-recursive install-strip-libs-recursive \
|
||||
uninstall-libs-recursive install-shlibs-libs-recursive \
|
||||
install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive \
|
||||
- coverage.txt-libs-recursive:
|
||||
+ coverage.txt-libs-recursive::
|
||||
@for subdir in $(LIB_SUBDIRS); do \
|
||||
if test -d $$subdir ; then \
|
||||
target=`echo $@|$(SED) 's/-libs-recursive//'`; \
|
||||
--
|
||||
cgit 1.2-0.3.lf.el7
|
||||
|
||||
@ -6,10 +6,11 @@
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="cron">Install e2scrub_all cron script</flag>
|
||||
<flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
|
||||
<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
|
||||
<remote-id type="sourceforge">e2fsprogs</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user