*: Drop mentions of elibc_FreeBSD

This commit is contained in:
Krzesimir Nowak 2022-01-07 08:25:49 +01:00
parent fc62c00e97
commit cef4a33476
16 changed files with 11 additions and 85 deletions

View File

@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
IUSE="elibc_FreeBSD +extra-filters nls static-libs"
IUSE="+extra-filters nls static-libs"
RDEPEND="!<app-arch/lzma-4.63
!<app-arch/p7zip-4.57
@ -73,7 +73,6 @@ multilib_src_configure() {
export gl_cv_posix_shell=${EPREFIX}/bin/sh
fi
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}

View File

@ -27,7 +27,7 @@ HOMEPAGE="https://tukaani.org/xz/"
# See top-level COPYING file as it outlines the various pieces and their licenses.
LICENSE="public-domain LGPL-2.1+ GPL-2+"
SLOT="0"
IUSE="elibc_FreeBSD +extra-filters nls static-libs"
IUSE="+extra-filters nls static-libs"
RDEPEND="!<app-arch/lzma-4.63
!<app-arch/p7zip-4.57
@ -73,7 +73,6 @@ multilib_src_configure() {
export gl_cv_posix_shell=${EPREFIX}/bin/sh
fi
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}

View File

@ -61,7 +61,7 @@ multilib_src_compile() {
$(use ssl && echo -ldl)
)
use elibc_Darwin || use elibc_DragonFly || use elibc_FreeBSD ||
use elibc_Darwin || use elibc_DragonFly ||
use elibc_NetBSD || use elibc_OpenBSD || use elibc_SunOS &&
ADDLDFLAGS+=( $(use nls && echo -lintl) )

View File

@ -13,7 +13,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="elibc_FreeBSD examples static-libs unicode"
IUSE="examples static-libs unicode"
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
DOCS=( README.md )
@ -73,12 +73,6 @@ multilib_src_install() {
sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
popd >/dev/null
fi
if multilib_is_native_abi ; then
# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
use elibc_FreeBSD && gen_usr_ldscript -a expat
fi
}
multilib_src_install_all() {

View File

@ -20,7 +20,7 @@
# Keep versionator inheritance in case consumers are using it implicitly.
[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver eutils multilib versionator
IUSE="elibc_FreeBSD"
IUSE=""
# Make sure we use java-config-2
export WANT_JAVA_CONFIG="2"
@ -1688,7 +1688,6 @@ java-pkg_get-jni-cflags() {
local flags="-I${JAVA_HOME}/include"
local platform="linux"
use elibc_FreeBSD && platform="freebsd"
# TODO do a check that the directories are valid
flags="${flags} -I${JAVA_HOME}/include/${platform}"

View File

@ -407,9 +407,6 @@ build_contrib_module() {
}
src_configure() {
# Bug 408001
use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
# connectionless ldap per bug #342439
append-cppflags -DLDAP_CONNECTIONLESS

View File

@ -407,9 +407,6 @@ build_contrib_module() {
}
src_configure() {
# Bug 408001
use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
# connectionless ldap per bug #342439
append-cppflags -DLDAP_CONNECTIONLESS

View File

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
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"
IUSE="cron fuse nls static-libs"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
@ -98,12 +98,6 @@ src_configure() {
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() {
@ -128,16 +122,4 @@ src_install() {
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die
fi
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
}

View File

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
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"
IUSE="cron fuse nls static-libs"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
@ -98,12 +98,6 @@ src_configure() {
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() {
@ -128,16 +122,4 @@ src_install() {
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die
fi
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
}

View File

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
LICENSE="GPL-2 BSD"
SLOT="0"
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"
IUSE="cron fuse nls static-libs"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
@ -98,12 +98,6 @@ src_configure() {
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() {
@ -128,16 +122,4 @@ src_install() {
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die
fi
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
}

View File

@ -20,13 +20,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
RDEPEND="
!elibc_FreeBSD? (
!elibc_SunOS? (
!elibc_Darwin? (
dev-libs/libbsd[${MULTILIB_USEDEP}]
)
)
)
python? ( ${PYTHON_DEPS} )
!!<sys-libs/talloc-2.0.5
"

View File

@ -20,13 +20,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
RDEPEND="
!elibc_FreeBSD? (
!elibc_SunOS? (
!elibc_Darwin? (
dev-libs/libbsd[${MULTILIB_USEDEP}]
)
)
)
python? ( ${PYTHON_DEPS} )
!!<sys-libs/talloc-2.0.5
"

View File

@ -19,7 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="test"
RDEPEND="
!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
dev-libs/libbsd[${MULTILIB_USEDEP}]
python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}
virtual/libcrypt"

View File

@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
RDEPEND="
!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
dev-libs/libbsd[${MULTILIB_USEDEP}]
>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
python? (
${PYTHON_DEPS}

View File

@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="test"
RDEPEND="
!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
dev-libs/libbsd[${MULTILIB_USEDEP}]
>=sys-libs/talloc-2.3.1[${MULTILIB_USEDEP}]
python? (
${PYTHON_DEPS}

View File

@ -13,5 +13,4 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
RDEPEND="!prefix? (
elibc_glibc? ( sys-libs/glibc:2.2 )
elibc_musl? ( sys-libs/musl )
elibc_FreeBSD? ( sys-freebsd/freebsd-lib )
)"