| 1 |
commit: 8fa4d682493e704cfdea5c51aecc26af868e9d97 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 5 22:36:00 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 5 23:40:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8fa4d682 |
| 7 |
|
| 8 |
defaults/software.sh: Add libxcrypt |
| 9 |
|
| 10 |
Needed for BusyBox when host system is using sys-libs/libxcrypt[-static-libs] |
| 11 |
which is usually enforced via package.use.force. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/798468 |
| 14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 15 |
|
| 16 |
defaults/software.sh | 9 ++++++++- |
| 17 |
gkbuilds/libxcrypt.gkbuild | 17 +++++++++++++++++ |
| 18 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/defaults/software.sh b/defaults/software.sh |
| 21 |
index 291bad4..54836ad 100644 |
| 22 |
--- a/defaults/software.sh |
| 23 |
+++ b/defaults/software.sh |
| 24 |
@@ -39,7 +39,7 @@ GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GK |
| 25 |
|
| 26 |
GKPKG_BUSYBOX_PN="busybox" |
| 27 |
GKPKG_BUSYBOX_PV="${GKPKG_BUSYBOX_PV:-VERSION_BUSYBOX}" |
| 28 |
-GKPKG_BUSYBOX_DEPS="" |
| 29 |
+GKPKG_BUSYBOX_DEPS="libxcrypt" |
| 30 |
GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX_PV}.tar.bz2}" |
| 31 |
GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}" |
| 32 |
GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}" |
| 33 |
@@ -156,6 +156,13 @@ GKPKG_LIBGPG_ERROR_SRCTAR="${GKPKG_LIBGPG_ERROR_SRCTAR:-${DISTDIR}/libgpg-error- |
| 34 |
GKPKG_LIBGPG_ERROR_SRCDIR="${GKPKG_LIBGPG_ERROR_SRCDIR:-libgpg-error-${GKPKG_LIBGPG_ERROR_PV}}" |
| 35 |
GKPKG_LIBGPG_ERROR_BINPKG="${GKPKG_LIBGPG_ERROR_BINPKG:-%%CACHE%%/libgpg-error-${GKPKG_LIBGPG_ERROR_PV}-%%ARCH%%.tar.xz}" |
| 36 |
|
| 37 |
+GKPKG_LIBXCRYPT_PN="libxcrypt" |
| 38 |
+GKPKG_LIBXCRYPT_PV="${GKPKG_LIBXCRYPT_PV:-VERSION_LIBXCRYPT}" |
| 39 |
+GKPKG_LIBXCRYPT_DEPS="" |
| 40 |
+GKPKG_LIBXCRYPT_SRCTAR="${GKPKG_LIBXCRYPT_SRCTAR:-${DISTDIR}/libxcrypt-${GKPKG_LIBXCRYPT_PV}.tar.gz}" |
| 41 |
+GKPKG_LIBXCRYPT_SRCDIR="${GKPKG_LIBXCRYPT_SRCDIR:-libxcrypt-${GKPKG_LIBXCRYPT_PV}}" |
| 42 |
+GKPKG_LIBXCRYPT_BINPKG="${GKPKG_LIBXCRYPT_BINPKG:-%%CACHE%%/libxcrypt-${GKPKG_LIBXCRYPT_PV}-%%ARCH%%.tar.xz}" |
| 43 |
+ |
| 44 |
GKPKG_LVM_PN="lvm" |
| 45 |
GKPKG_LVM_PV="${GKPKG_LVM_PV:-VERSION_LVM}" |
| 46 |
GKPKG_LVM_DEPS="util-linux eudev libaio" |
| 47 |
|
| 48 |
diff --git a/gkbuilds/libxcrypt.gkbuild b/gkbuilds/libxcrypt.gkbuild |
| 49 |
new file mode 100644 |
| 50 |
index 0000000..1834e25 |
| 51 |
--- /dev/null |
| 52 |
+++ b/gkbuilds/libxcrypt.gkbuild |
| 53 |
@@ -0,0 +1,17 @@ |
| 54 |
+# Copyright 2021 Gentoo Authors |
| 55 |
+# Distributed under the terms of the GNU General Public License v2 |
| 56 |
+ |
| 57 |
+src_prepare() { |
| 58 |
+ default |
| 59 |
+ |
| 60 |
+ gkautoreconf |
| 61 |
+} |
| 62 |
+ |
| 63 |
+src_configure() { |
| 64 |
+ local myopts=( |
| 65 |
+ --enable-shared |
| 66 |
+ --enable-static |
| 67 |
+ ) |
| 68 |
+ |
| 69 |
+ gkconf "${myopts[@]}" |
| 70 |
+} |
Archives