commit: 8fa4d682493e704cfdea5c51aecc26af868e9d97 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Mon Jul 5 22:36:00 2021 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Mon Jul 5 23:40:51 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8fa4d682
defaults/software.sh: Add libxcrypt Needed for BusyBox when host system is using sys-libs/libxcrypt[-static-libs] which is usually enforced via package.use.force. Bug: https://bugs.gentoo.org/798468 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/software.sh | 9 ++++++++- gkbuilds/libxcrypt.gkbuild | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/defaults/software.sh b/defaults/software.sh index 291bad4..54836ad 100644 --- a/defaults/software.sh +++ b/defaults/software.sh @@ -39,7 +39,7 @@ GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GK GKPKG_BUSYBOX_PN="busybox" GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-VERSION_BUSYBOX}" -GKPKG_BUSYBOX_DEPS="" +GKPKG_BUSYBOX_DEPS="libxcrypt" GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX_PV}.tar.bz2}" GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}" GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}" @@ -156,6 +156,13 @@ GKPKG_LIBGPG_ERROR_SRCTAR="${GKPKG_LIBGPG_ERROR_SRCTAR:-${DISTDIR}/libgpg-error- GKPKG_LIBGPG_ERROR_SRCDIR="${GKPKG_LIBGPG_ERROR_SRCDIR:-libgpg-error-${GKPKG_LIBGPG_ERROR_PV}}" GKPKG_LIBGPG_ERROR_BINPKG="${GKPKG_LIBGPG_ERROR_BINPKG:-%%CACHE%%/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}-%%ARCH%%.tar.xz}" +GKPKG_LIBXCRYPT_PN="libxcrypt" +GKPKG_LIBXCRYPT_PV="${GKPKG_LIBXCRYPT_PV:-VERSION_LIBXCRYPT}" +GKPKG_LIBXCRYPT_DEPS="" +GKPKG_LIBXCRYPT_SRCTAR="${GKPKG_LIBXCRYPT_SRCTAR:-${DISTDIR}/libxcrypt-${GKPKG_LIBXCRYPT_PV}.tar.gz}" +GKPKG_LIBXCRYPT_SRCDIR="${GKPKG_LIBXCRYPT_SRCDIR:-libxcrypt-${GKPKG_LIBXCRYPT_PV}}" +GKPKG_LIBXCRYPT_BINPKG="${GKPKG_LIBXCRYPT_BINPKG:-%%CACHE%%/libxcrypt-${GKPKG_LIBXCRYPT_PV}-%%ARCH%%.tar.xz}" + GKPKG_LVM_PN="lvm" GKPKG_LVM_PV="${GKPKG_LVM_PV:-VERSION_LVM}" GKPKG_LVM_DEPS="util-linux eudev libaio" diff --git a/gkbuilds/libxcrypt.gkbuild b/gkbuilds/libxcrypt.gkbuild new file mode 100644 index 0000000..1834e25 --- /dev/null +++ b/gkbuilds/libxcrypt.gkbuild @@ -0,0 +1,17 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +src_prepare() { + default + + gkautoreconf +} + +src_configure() { + local myopts=( + --enable-shared + --enable-static + ) + + gkconf "${myopts[@]}" +}
