mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 06:37:10 -08:00
sys-libs/libxcrypt: drop 4.4.34, 4.4.35
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,5 +1,3 @@
|
||||
DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
|
||||
DIST libxcrypt-4.4.33-autotools.tar.xz 624316 BLAKE2B 6a396d079ea011fabc46ae2f972e230f3e047f75f9c79c8345fe4f31bad24b9bcb50b3f1131fd5d34cfaf0d6e0ca4fa0a0418448390de95bdf78b0ab8022a72d SHA512 998ef7ca565339853458961c28a0bffe04a4859de305019efae9b586d7b28ba42210b238695680dc10d739e7947f94e4392b9022a96ed25a613ef9a29a888329
|
||||
DIST libxcrypt-4.4.34-autotools.tar.xz 621732 BLAKE2B acf1801d890f522b9a098943f55f8551652ef3e0620bee5e7f3c297b7d0867ba6bace71fcf106474d25e95bcf4bd57e4ced6b51782cbaf0d42cca1643668407b SHA512 ef04ee78bf2e28e715fa673a1af728209c11838c66f7ec13cef40332595f77b878ac698616d6ef861b86879b0addd5581350041e889f2cef2ed1363f0ed93ffb
|
||||
DIST libxcrypt-4.4.35-autotools.tar.xz 622972 BLAKE2B 93e8ee0d028aa8b2d1b3882c48cd056a1f60ea22c44f38b29c78eaea6719fa9d01c1d0d78065a2c1adbab6f5ca9a2570ee411f78673b979a3b5c2a1f930e275d SHA512 c024b183417db2c4bd8bcc371e8789182ad98f91c79d6a64ce9505abd0251ef6499e8fbceb914274ca50f477fe068e3cf69eed197287bb2c0491aa91ead4df52
|
||||
DIST libxcrypt-4.4.36-autotools.tar.xz 624660 BLAKE2B 8dc3d0f354baf8c64dc011e95e7df10d48b0dfe428503936ffd55edf2745de04003c7efe231ed5d9a14cea7f682ba377b7e00f0463b4060c50c9c29f555b790f SHA512 fb8391ecb89622eb0d74d13c5fc1369718e83c47671449044ca0c2f78a236d7b06177a60bf8cda47694caa840c68eaaf0b23690e8975fa5d64b734c8eb246d10
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
|
||||
Date: Sun, 25 Jun 2023 01:35:08 +0200
|
||||
Subject: [PATCH] Remove smartmatch usage from gen-crypt-h
|
||||
|
||||
Needed for Perl 5.38
|
||||
---
|
||||
build-aux/scripts/gen-crypt-h | 31 ++++++++++++++-----------------
|
||||
1 file changed, 14 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h
|
||||
index 12aecf6..b113b79 100644
|
||||
--- a/build-aux/scripts/gen-crypt-h
|
||||
+++ b/build-aux/scripts/gen-crypt-h
|
||||
@@ -12,7 +12,6 @@ use v5.14; # implicit use strict, use feature ':5.14'
|
||||
use warnings FATAL => 'all';
|
||||
use utf8;
|
||||
use open qw(:std :utf8);
|
||||
-no if $] >= 5.018, warnings => 'experimental::smartmatch';
|
||||
no if $] >= 5.022, warnings => 'experimental::re_strict';
|
||||
use if $] >= 5.022, re => 'strict';
|
||||
|
||||
@@ -37,22 +36,20 @@ sub process_config_h {
|
||||
local $_;
|
||||
while (<$fh>) {
|
||||
chomp;
|
||||
- # Yes, 'given $_' is really required here.
|
||||
- given ($_) {
|
||||
- when ('#define HAVE_SYS_CDEFS_H 1') {
|
||||
- $have_sys_cdefs_h = 1;
|
||||
- }
|
||||
- when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
|
||||
- $have_sys_cdefs_begin_end_decls = 1;
|
||||
- }
|
||||
- when ('#define HAVE_SYS_CDEFS_THROW 1') {
|
||||
- $have_sys_cdefs_throw = 1;
|
||||
- }
|
||||
- when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
|
||||
- $substs{XCRYPT_VERSION_STR} = $1;
|
||||
- $substs{XCRYPT_VERSION_MAJOR} = $2;
|
||||
- $substs{XCRYPT_VERSION_MINOR} = $3;
|
||||
- }
|
||||
+
|
||||
+ if ($_ eq '#define HAVE_SYS_CDEFS_H 1') {
|
||||
+ $have_sys_cdefs_h = 1;
|
||||
+ }
|
||||
+ elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
|
||||
+ $have_sys_cdefs_begin_end_decls = 1;
|
||||
+ }
|
||||
+ elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') {
|
||||
+ $have_sys_cdefs_throw = 1;
|
||||
+ }
|
||||
+ elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
|
||||
+ $substs{XCRYPT_VERSION_STR} = $1;
|
||||
+ $substs{XCRYPT_VERSION_MAJOR} = $2;
|
||||
+ $substs{XCRYPT_VERSION_MINOR} = $3;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.39.3
|
||||
|
||||
@@ -1,340 +0,0 @@
|
||||
# Copyright 2004-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
# NEED_BOOTSTRAP is for developers to quickly generate a tarball
|
||||
# for publishing to the tree.
|
||||
NEED_BOOTSTRAP="no"
|
||||
inherit multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
|
||||
|
||||
DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
|
||||
HOMEPAGE="https://github.com/besser82/libxcrypt"
|
||||
if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
|
||||
inherit autotools
|
||||
SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="+compat split-usr static-libs +system test headers-only"
|
||||
REQUIRED_USE="split-usr? ( system )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
if [[ ${CTARGET} == ${CHOST} ]] ; then
|
||||
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
|
||||
export CTARGET=${CATEGORY/cross-}
|
||||
fi
|
||||
fi
|
||||
|
||||
is_cross() {
|
||||
local enabled_abis=( $(multilib_get_enabled_abis) )
|
||||
[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
|
||||
}
|
||||
|
||||
DEPEND="
|
||||
system? (
|
||||
elibc_glibc? (
|
||||
${CATEGORY}/glibc[-crypt(+)]
|
||||
!${CATEGORY}/glibc[crypt(+)]
|
||||
)
|
||||
elibc_musl? (
|
||||
${CATEGORY}/musl[-crypt(+)]
|
||||
!${CATEGORY}/musl[crypt(+)]
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
dev-lang/perl
|
||||
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
|
||||
"
|
||||
|
||||
python_check_deps() {
|
||||
python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if has "distcc" ${FEATURES} ; then
|
||||
ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
|
||||
ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
|
||||
|
||||
if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
|
||||
die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
MULTIBUILD_VARIANTS=(
|
||||
$(usex compat 'xcrypt_compat' '')
|
||||
xcrypt_nocompat
|
||||
)
|
||||
|
||||
use test && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# WARNING: Please read on bumping or applying patches!
|
||||
#
|
||||
# There are two circular dependencies to be aware of:
|
||||
# 1)
|
||||
# if we're bootstrapping configure and makefiles:
|
||||
# libxcrypt -> automake -> perl -> libxcrypt
|
||||
#
|
||||
# mitigation:
|
||||
# toolchain@ manually runs `make dist` after running autoconf + `./configure`
|
||||
# and the ebuild uses that.
|
||||
# (Don't include the pre-generated Perl artefacts.)
|
||||
#
|
||||
# solution for future:
|
||||
# Upstream are working on producing `make dist` tarballs.
|
||||
# https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
|
||||
#
|
||||
# 2)
|
||||
# configure *unconditionally* needs Perl at build time to generate
|
||||
# a list of enabled algorithms based on the set passed to `configure`:
|
||||
# libxcrypt -> perl -> libxcrypt
|
||||
#
|
||||
# mitigation:
|
||||
# None at the moment.
|
||||
#
|
||||
# solution for future:
|
||||
# Not possible right now. Upstream intend on depending on Perl for further
|
||||
# configuration options.
|
||||
# https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
|
||||
#
|
||||
# Therefore, on changes (inc. bumps):
|
||||
# * You must check whether upstream have started providing tarballs with bootstrapped
|
||||
# auto{conf,make};
|
||||
#
|
||||
# * diff the build system changes!
|
||||
#
|
||||
if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
|
||||
# Facilitate our split variant build for compat + non-compat
|
||||
eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
|
||||
eautoreconf
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Avoid possible "illegal instruction" errors with gold
|
||||
# bug #821496
|
||||
tc-ld-disable-gold
|
||||
|
||||
# Doesn't work with LTO: bug #852917.
|
||||
# https://github.com/besser82/libxcrypt/issues/24
|
||||
filter-lto
|
||||
|
||||
# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
|
||||
# https://github.com/gentoo/gentoo/pull/28355
|
||||
# mold needs this too but right now tc-ld-is-mold is also not available
|
||||
if tc-ld-is-lld; then
|
||||
append-ldflags -Wl,--undefined-version
|
||||
fi
|
||||
|
||||
multibuild_foreach_variant multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
get_xcprefix() {
|
||||
if is_cross; then
|
||||
echo "${EPREFIX}/usr/${CTARGET}"
|
||||
else
|
||||
echo "${EPREFIX}"
|
||||
fi
|
||||
}
|
||||
|
||||
get_xclibdir() {
|
||||
printf -- "%s/%s/%s/%s\n" \
|
||||
"$(get_xcprefix)" \
|
||||
"$(usex split-usr '' '/usr')" \
|
||||
"$(get_libdir)" \
|
||||
"$(usex system '' 'xcrypt')"
|
||||
}
|
||||
|
||||
get_xcincludedir() {
|
||||
printf -- "%s/usr/include/%s\n" \
|
||||
"$(get_xcprefix)" \
|
||||
"$(usex system '' 'xcrypt')"
|
||||
}
|
||||
|
||||
get_xcmandir() {
|
||||
printf -- "%s/usr/share/man\n" \
|
||||
"$(get_xcprefix)"
|
||||
}
|
||||
|
||||
get_xcpkgconfigdir() {
|
||||
printf -- "%s/usr/%s/pkgconfig\n" \
|
||||
"$(get_xcprefix)" \
|
||||
"$(get_libdir)"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local -a myconf=(
|
||||
--host=${CTARGET}
|
||||
--disable-werror
|
||||
--libdir=$(get_xclibdir)
|
||||
--with-pkgconfigdir=$(get_xcpkgconfigdir)
|
||||
--includedir=$(get_xcincludedir)
|
||||
--mandir="$(get_xcmandir)"
|
||||
)
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
if is_cross; then
|
||||
if tc-is-clang; then
|
||||
export CC="${CTARGET}-clang"
|
||||
else
|
||||
export CC="${CTARGET}-gcc"
|
||||
fi
|
||||
fi
|
||||
|
||||
case "${MULTIBUILD_ID}" in
|
||||
xcrypt_compat-*)
|
||||
myconf+=(
|
||||
--disable-static
|
||||
--disable-xcrypt-compat-files
|
||||
--enable-obsolete-api=yes
|
||||
)
|
||||
;;
|
||||
xcrypt_nocompat-*)
|
||||
myconf+=(
|
||||
--enable-obsolete-api=no
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
;;
|
||||
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
|
||||
esac
|
||||
|
||||
if use headers-only; then
|
||||
# Nothing is compiled here which would affect the headers for the target.
|
||||
# So forcing CC is sane.
|
||||
headers_only_flags="CC=$(tc-getBUILD_CC)"
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use headers-only && return
|
||||
|
||||
multibuild_foreach_variant multilib-minimal_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_test() {
|
||||
multibuild_foreach_variant multilib-minimal_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
multibuild_foreach_variant multilib-minimal_src_install
|
||||
|
||||
use headers-only || \
|
||||
(
|
||||
shopt -s failglob || die "failglob failed"
|
||||
|
||||
# Make sure our man pages do not collide with glibc or man-pages.
|
||||
for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
|
||||
mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
|
||||
|| die "mv failed"
|
||||
done
|
||||
) || die "failglob error"
|
||||
|
||||
# Remove useless stuff from installation
|
||||
find "${ED}"/usr/share/doc/${PF} -type l -delete || die
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
# workaround broken upstream cross-* --docdir by installing files in proper locations
|
||||
if is_cross; then
|
||||
insinto "$(get_xcprefix)"/usr/share
|
||||
doins -r "${ED}"/usr/share/doc
|
||||
rm -r "${ED}"/usr/share/doc || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if use headers-only; then
|
||||
emake DESTDIR="${D}" install-nodist_includeHEADERS
|
||||
return
|
||||
fi
|
||||
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# Don't install the libcrypt.so symlink for the "compat" version
|
||||
case "${MULTIBUILD_ID}" in
|
||||
xcrypt_compat-*)
|
||||
rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
|
||||
|| die "failed to remove extra compat libraries"
|
||||
;;
|
||||
xcrypt_nocompat-*)
|
||||
if use split-usr; then
|
||||
(
|
||||
if use static-libs; then
|
||||
# .a files are installed to /$(get_libdir) by default
|
||||
# Move static libraries to /usr prefix or portage will abort
|
||||
shopt -s nullglob || die "failglob failed"
|
||||
static_libs=( "${D}"/$(get_xclibdir)/*.a )
|
||||
|
||||
if [[ -n ${static_libs[*]} ]]; then
|
||||
dodir "/usr/$(get_xclibdir)"
|
||||
mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
|
||||
|| die "Moving static libs failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use system; then
|
||||
# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
|
||||
# to allow linker to correctly find shared libraries.
|
||||
shopt -s failglob || die "failglob failed"
|
||||
|
||||
for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
|
||||
lib_file_basename="$(basename "${lib_file}")"
|
||||
lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
|
||||
|
||||
# We already know we're in split-usr (checked above)
|
||||
# See bug #843209 (also worth keeping in mind bug #802222 too)
|
||||
local libdir_no_prefix=$(get_xclibdir)
|
||||
libdir_no_prefix=${libdir_no_prefix#${EPREFIX}}
|
||||
libdir_no_prefix=${libdir_no_prefix%/usr}
|
||||
dosym -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}"
|
||||
done
|
||||
|
||||
rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
|
||||
fi
|
||||
)
|
||||
fi
|
||||
;;
|
||||
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
|
||||
esac
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Verify we're not in a bad case like bug #843209 with broken symlinks.
|
||||
# This can be dropped when, if ever, the split-usr && system && compat case
|
||||
# is cleaned up in *_src_install.
|
||||
local broken_symlinks=()
|
||||
mapfile -d '' broken_symlinks < <(
|
||||
find "${ED}" -xtype l -print0
|
||||
)
|
||||
|
||||
if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
|
||||
eerror "Broken symlinks found before merging!"
|
||||
local symlink target resolved
|
||||
for symlink in "${broken_symlinks[@]}" ; do
|
||||
target="$(readlink "${symlink}")"
|
||||
resolved="$(readlink -f "${symlink}")"
|
||||
eerror " '${symlink}' -> '${target}' (${resolved})"
|
||||
done
|
||||
die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
|
||||
fi
|
||||
}
|
||||
@@ -1,344 +0,0 @@
|
||||
# Copyright 2004-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
# NEED_BOOTSTRAP is for developers to quickly generate a tarball
|
||||
# for publishing to the tree.
|
||||
NEED_BOOTSTRAP="no"
|
||||
inherit multibuild multilib python-any-r1 flag-o-matic toolchain-funcs multilib-minimal
|
||||
|
||||
DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
|
||||
HOMEPAGE="https://github.com/besser82/libxcrypt"
|
||||
if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
|
||||
inherit autotools
|
||||
SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
else
|
||||
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
|
||||
fi
|
||||
|
||||
LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="+compat split-usr static-libs +system test headers-only"
|
||||
REQUIRED_USE="split-usr? ( system )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
if [[ ${CTARGET} == ${CHOST} ]] ; then
|
||||
if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
|
||||
export CTARGET=${CATEGORY/cross-}
|
||||
fi
|
||||
fi
|
||||
|
||||
is_cross() {
|
||||
local enabled_abis=( $(multilib_get_enabled_abis) )
|
||||
[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
|
||||
}
|
||||
|
||||
DEPEND="
|
||||
system? (
|
||||
elibc_glibc? (
|
||||
${CATEGORY}/glibc[-crypt(+)]
|
||||
!${CATEGORY}/glibc[crypt(+)]
|
||||
)
|
||||
elibc_musl? (
|
||||
${CATEGORY}/musl[-crypt(+)]
|
||||
!${CATEGORY}/musl[crypt(+)]
|
||||
)
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
dev-lang/perl
|
||||
test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-smartmatch.patch"
|
||||
)
|
||||
|
||||
python_check_deps() {
|
||||
python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
if has "distcc" ${FEATURES} ; then
|
||||
ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
|
||||
ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
|
||||
|
||||
if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
|
||||
die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
MULTIBUILD_VARIANTS=(
|
||||
$(usex compat 'xcrypt_compat' '')
|
||||
xcrypt_nocompat
|
||||
)
|
||||
|
||||
use test && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# WARNING: Please read on bumping or applying patches!
|
||||
#
|
||||
# There are two circular dependencies to be aware of:
|
||||
# 1)
|
||||
# if we're bootstrapping configure and makefiles:
|
||||
# libxcrypt -> automake -> perl -> libxcrypt
|
||||
#
|
||||
# mitigation:
|
||||
# toolchain@ manually runs `make dist` after running autoconf + `./configure`
|
||||
# and the ebuild uses that.
|
||||
# (Don't include the pre-generated Perl artefacts.)
|
||||
#
|
||||
# solution for future:
|
||||
# Upstream are working on producing `make dist` tarballs.
|
||||
# https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
|
||||
#
|
||||
# 2)
|
||||
# configure *unconditionally* needs Perl at build time to generate
|
||||
# a list of enabled algorithms based on the set passed to `configure`:
|
||||
# libxcrypt -> perl -> libxcrypt
|
||||
#
|
||||
# mitigation:
|
||||
# None at the moment.
|
||||
#
|
||||
# solution for future:
|
||||
# Not possible right now. Upstream intend on depending on Perl for further
|
||||
# configuration options.
|
||||
# https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
|
||||
#
|
||||
# Therefore, on changes (inc. bumps):
|
||||
# * You must check whether upstream have started providing tarballs with bootstrapped
|
||||
# auto{conf,make};
|
||||
#
|
||||
# * diff the build system changes!
|
||||
#
|
||||
if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
|
||||
# Facilitate our split variant build for compat + non-compat
|
||||
eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
|
||||
eautoreconf
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Avoid possible "illegal instruction" errors with gold
|
||||
# bug #821496
|
||||
tc-ld-disable-gold
|
||||
|
||||
# Doesn't work with LTO: bug #852917.
|
||||
# https://github.com/besser82/libxcrypt/issues/24
|
||||
filter-lto
|
||||
|
||||
# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
|
||||
# https://github.com/gentoo/gentoo/pull/28355
|
||||
# mold needs this too but right now tc-ld-is-mold is also not available
|
||||
if tc-ld-is-lld; then
|
||||
append-ldflags -Wl,--undefined-version
|
||||
fi
|
||||
|
||||
multibuild_foreach_variant multilib-minimal_src_configure
|
||||
}
|
||||
|
||||
get_xcprefix() {
|
||||
if is_cross; then
|
||||
echo "${EPREFIX}/usr/${CTARGET}"
|
||||
else
|
||||
echo "${EPREFIX}"
|
||||
fi
|
||||
}
|
||||
|
||||
get_xclibdir() {
|
||||
printf -- "%s/%s/%s/%s\n" \
|
||||
"$(get_xcprefix)" \
|
||||
"$(usex split-usr '' '/usr')" \
|
||||
"$(get_libdir)" \
|
||||
"$(usex system '' 'xcrypt')"
|
||||
}
|
||||
|
||||
get_xcincludedir() {
|
||||
printf -- "%s/usr/include/%s\n" \
|
||||
"$(get_xcprefix)" \
|
||||
"$(usex system '' 'xcrypt')"
|
||||
}
|
||||
|
||||
get_xcmandir() {
|
||||
printf -- "%s/usr/share/man\n" \
|
||||
"$(get_xcprefix)"
|
||||
}
|
||||
|
||||
get_xcpkgconfigdir() {
|
||||
printf -- "%s/usr/%s/pkgconfig\n" \
|
||||
"$(get_xcprefix)" \
|
||||
"$(get_libdir)"
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local -a myconf=(
|
||||
--host=${CTARGET}
|
||||
--disable-werror
|
||||
--libdir=$(get_xclibdir)
|
||||
--with-pkgconfigdir=$(get_xcpkgconfigdir)
|
||||
--includedir=$(get_xcincludedir)
|
||||
--mandir="$(get_xcmandir)"
|
||||
)
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
if is_cross; then
|
||||
if tc-is-clang; then
|
||||
export CC="${CTARGET}-clang"
|
||||
else
|
||||
export CC="${CTARGET}-gcc"
|
||||
fi
|
||||
fi
|
||||
|
||||
case "${MULTIBUILD_ID}" in
|
||||
xcrypt_compat-*)
|
||||
myconf+=(
|
||||
--disable-static
|
||||
--disable-xcrypt-compat-files
|
||||
--enable-obsolete-api=yes
|
||||
)
|
||||
;;
|
||||
xcrypt_nocompat-*)
|
||||
myconf+=(
|
||||
--enable-obsolete-api=no
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
;;
|
||||
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
|
||||
esac
|
||||
|
||||
if use headers-only; then
|
||||
# Nothing is compiled here which would affect the headers for the target.
|
||||
# So forcing CC is sane.
|
||||
headers_only_flags="CC=$(tc-getBUILD_CC)"
|
||||
fi
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${headers_only_flags}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use headers-only && return
|
||||
|
||||
multibuild_foreach_variant multilib-minimal_src_compile
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_test() {
|
||||
multibuild_foreach_variant multilib-minimal_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
multibuild_foreach_variant multilib-minimal_src_install
|
||||
|
||||
use headers-only || \
|
||||
(
|
||||
shopt -s failglob || die "failglob failed"
|
||||
|
||||
# Make sure our man pages do not collide with glibc or man-pages.
|
||||
for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
|
||||
mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
|
||||
|| die "mv failed"
|
||||
done
|
||||
) || die "failglob error"
|
||||
|
||||
# Remove useless stuff from installation
|
||||
find "${ED}"/usr/share/doc/${PF} -type l -delete || die
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
# workaround broken upstream cross-* --docdir by installing files in proper locations
|
||||
if is_cross; then
|
||||
insinto "$(get_xcprefix)"/usr/share
|
||||
doins -r "${ED}"/usr/share/doc
|
||||
rm -r "${ED}"/usr/share/doc || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if use headers-only; then
|
||||
emake DESTDIR="${D}" install-nodist_includeHEADERS
|
||||
return
|
||||
fi
|
||||
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# Don't install the libcrypt.so symlink for the "compat" version
|
||||
case "${MULTIBUILD_ID}" in
|
||||
xcrypt_compat-*)
|
||||
rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
|
||||
|| die "failed to remove extra compat libraries"
|
||||
;;
|
||||
xcrypt_nocompat-*)
|
||||
if use split-usr; then
|
||||
(
|
||||
if use static-libs; then
|
||||
# .a files are installed to /$(get_libdir) by default
|
||||
# Move static libraries to /usr prefix or portage will abort
|
||||
shopt -s nullglob || die "failglob failed"
|
||||
static_libs=( "${D}"/$(get_xclibdir)/*.a )
|
||||
|
||||
if [[ -n ${static_libs[*]} ]]; then
|
||||
dodir "/usr/$(get_xclibdir)"
|
||||
mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
|
||||
|| die "Moving static libs failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use system; then
|
||||
# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
|
||||
# to allow linker to correctly find shared libraries.
|
||||
shopt -s failglob || die "failglob failed"
|
||||
|
||||
for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
|
||||
lib_file_basename="$(basename "${lib_file}")"
|
||||
lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
|
||||
|
||||
# We already know we're in split-usr (checked above)
|
||||
# See bug #843209 (also worth keeping in mind bug #802222 too)
|
||||
local libdir_no_prefix=$(get_xclibdir)
|
||||
libdir_no_prefix=${libdir_no_prefix#${EPREFIX}}
|
||||
libdir_no_prefix=${libdir_no_prefix%/usr}
|
||||
dosym -r "/$(get_libdir)/${lib_file_target}" "/usr/${libdir_no_prefix}/${lib_file_basename}"
|
||||
done
|
||||
|
||||
rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
|
||||
fi
|
||||
)
|
||||
fi
|
||||
;;
|
||||
*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
|
||||
esac
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Verify we're not in a bad case like bug #843209 with broken symlinks.
|
||||
# This can be dropped when, if ever, the split-usr && system && compat case
|
||||
# is cleaned up in *_src_install.
|
||||
local broken_symlinks=()
|
||||
mapfile -d '' broken_symlinks < <(
|
||||
find "${ED}" -xtype l -print0
|
||||
)
|
||||
|
||||
if [[ ${#broken_symlinks[@]} -gt 0 ]]; then
|
||||
eerror "Broken symlinks found before merging!"
|
||||
local symlink target resolved
|
||||
for symlink in "${broken_symlinks[@]}" ; do
|
||||
target="$(readlink "${symlink}")"
|
||||
resolved="$(readlink -f "${symlink}")"
|
||||
eerror " '${symlink}' -> '${target}' (${resolved})"
|
||||
done
|
||||
die "Broken symlinks found! Aborting to avoid damaging system. Please report a bug."
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user