public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/
Date: Mon, 11 Mar 2024 03:29:22 +0000 (UTC)	[thread overview]
Message-ID: <1710127730.03f1639e36e33a7d85b9fb09f4799067fe45a984.floppym@gentoo> (raw)

commit:     03f1639e36e33a7d85b9fb09f4799067fe45a984
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 03:12:47 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 03:28:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f1639e

sys-libs/libxcrypt: general clean up

Drop support for split-usr.
Simplify logic to determine install paths.
Use crossdev.eclass for cross-* support.
Avoid storing "/usr/${CTARGET}" in pkgconfig files for cross builds.
Move python_setup to src_configure.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 254 ++++++++++++++++++++++++++
 1 file changed, 254 insertions(+)

diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
new file mode 100644
index 000000000000..3faec08e8e41
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2004-2024 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 crossdev 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/libxcrypt/releases/download/v${PV}/${P}.tar.xz"
+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 static-libs +system test headers-only"
+RESTRICT="!test? ( test )"
+
+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() {
+	:
+}
+
+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() {
+	MULTIBUILD_VARIANTS=(
+		$(usev compat 'xcrypt_compat')
+		xcrypt_nocompat
+	)
+
+	MYPREFIX=${EPREFIX}
+	MYSYSROOT=${ESYSROOT}
+
+	if target_is_not_host; then
+		local CHOST=${CTARGET}
+
+		MYPREFIX=
+		MYSYSROOT=${ESYSROOT}/usr/${CTARGET}
+
+		# Ensure we get compatible libdir
+		unset DEFAULT_ABI MULTILIB_ABIS
+		multilib_env
+		ABI=${DEFAULT_ABI}
+
+		tc-getCC >/dev/null
+		if [[ ${CC} != ${CHOST}-* ]]; then
+			unset CC
+			tc-getCC >/dev/null
+		fi
+
+		strip-unsupported-flags
+	fi
+
+	if use headers-only; then
+		# Nothing is compiled here which would affect the headers for the target.
+		# So forcing CC is sane.
+		local -x CC="$(tc-getBUILD_CC)"
+	fi
+
+	# 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
+
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	if use test; then
+		python_setup
+	fi
+
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-werror
+		--prefix="${MYPREFIX}/usr"
+		--libdir="${MYPREFIX}/usr/$(get_libdir)$(usev !system /xcrypt)"
+		--includedir="${MYPREFIX}/usr/include$(usev !system /xcrypt)"
+		--with-pkgconfigdir="${MYPREFIX}/usr/$(get_libdir)/pkgconfig"
+		--with-sysroot="${MYSYSROOT}"
+	)
+
+	tc-export PKG_CONFIG
+
+	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
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+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() {
+	local DESTDIR=${D}
+	if target_is_not_host; then
+		DESTDIR=${ED}/usr/${CTARGET}
+	fi
+
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	find "${ED}" -name '*.la' -delete || die
+
+	if target_is_not_host; then
+		insinto /usr/${CTARGET}/usr/share
+		doins -r "${ED}/usr/share/doc"
+		rm -r "${ED}/usr/share/doc" || die
+		rmdir "${ED}/usr/share" || die
+	fi
+}
+
+multilib_src_install() {
+	if use headers-only; then
+		emake DESTDIR="${DESTDIR}" install-nodist_includeHEADERS
+	else
+		emake DESTDIR="${DESTDIR}" install
+		# Conflicts with sys-apps/man-pages
+		rm "${DESTDIR}${MYPREFIX}"/usr/share/man/man3/crypt{,_r}.3 || die
+	fi
+}
+
+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
+}


             reply	other threads:[~2024-03-11  3:29 UTC|newest]

Thread overview: 161+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-11  3:29 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-07 10:11 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libxcrypt/ Sam James
2025-05-07 10:11 Sam James
2025-05-07 10:11 Sam James
2025-05-07 10:10 Sam James
2025-04-26 12:41 Arthur Zamarin
2025-04-26  5:28 Sam James
2025-04-26  2:56 Sam James
2025-04-26  2:18 Sam James
2025-02-27 17:10 Mike Gilbert
2025-02-27 17:10 Mike Gilbert
2025-02-21 16:38 Mike Gilbert
2025-02-09  7:09 Sam James
2025-01-22  7:24 Sam James
2024-10-07  6:22 Sam James
2024-05-01  5:28 Joonas Niilola
2024-04-15  6:40 Arthur Zamarin
2024-04-13 18:37 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 17:48 Arthur Zamarin
2024-04-13 15:25 Mike Gilbert
2024-04-13 15:22 Mike Gilbert
2024-03-04 10:24 Sam James
2024-01-29 22:14 Andreas K. Hüttel
2024-01-03 10:40 Sam James
2023-10-28 22:16 Sam James
2023-09-14 22:54 Sam James
2023-09-03  3:43 Sam James
2023-09-02 17:46 Sam James
2023-09-02 17:46 Sam James
2023-09-02 17:46 Sam James
2023-09-02 16:56 Sam James
2023-09-02 16:55 Sam James
2023-07-05 19:31 Sam James
2023-06-06 21:07 Sam James
2023-06-01  3:54 Sam James
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-24 13:18 Arthur Zamarin
2023-03-19 22:08 Sam James
2023-01-14 19:17 Sam James
2022-12-16  7:53 Sam James
2022-12-16  7:52 Sam James
2022-11-24 19:52 Mike Gilbert
2022-11-19  3:19 Sam James
2022-11-19  3:19 Sam James
2022-11-18  6:23 Sam James
2022-11-18  6:23 Sam James
2022-11-14  3:50 Sam James
2022-11-14  3:50 Sam James
2022-11-08  1:30 Sam James
2022-11-02  4:05 Sam James
2022-11-02  3:50 Sam James
2022-11-02  3:05 Sam James
2022-11-02  3:02 Sam James
2022-10-31 20:47 Sam James
2022-10-19  3:15 Sam James
2022-10-15 17:26 Mike Gilbert
2022-10-08 15:31 Mike Gilbert
2022-10-08 15:31 Mike Gilbert
2022-09-23  1:56 Sam James
2022-09-10 11:28 Sam James
2022-08-26 10:46 Sam James
2022-08-20 15:54 Arthur Zamarin
2022-07-30 14:06 Arthur Zamarin
2022-07-18  7:20 Agostino Sarubbo
2022-07-17 19:45 Sam James
2022-07-17 19:45 Sam James
2022-07-17 19:42 Sam James
2022-07-17 19:40 Sam James
2022-07-17 17:34 Sam James
2022-07-17 17:34 Sam James
2022-07-17 15:24 Sam James
2022-06-18 15:15 Sam James
2022-05-24  2:16 Sam James
2022-05-07  5:04 Sam James
2022-04-23 23:55 Sam James
2022-04-17 18:32 Sam James
2022-03-08 15:13 Sam James
2022-02-25 18:38 Sam James
2022-02-20  9:14 Agostino Sarubbo
2022-02-19 19:28 Sam James
2022-02-19 12:02 Arthur Zamarin
2022-02-19 12:02 Arthur Zamarin
2022-02-19  8:46 Arthur Zamarin
2022-02-19  3:38 Sam James
2022-02-19  3:06 Sam James
2022-01-06 10:39 David Seifert
2022-01-05  5:24 Sam James
2021-12-18  7:05 Sam James
2021-12-03 18:57 Sam James
2021-12-02  1:16 Sam James
2021-11-19 17:42 Sam James
2021-11-06  0:52 Sam James
2021-10-31 18:12 Sam James
2021-10-31 18:12 Sam James
2021-10-31 18:12 Sam James
2021-10-31 18:10 Sam James
2021-10-31 18:10 Sam James
2021-10-31 18:10 Sam James
2021-10-21  6:44 Sam James
2021-09-24 21:02 Mike Gilbert
2021-09-17 20:20 Sam James
2021-09-03  1:53 Sam James
2021-08-21 22:15 James Le Cuirot
2021-08-11  2:37 Sam James
2021-08-09  4:12 Sam James
2021-08-07  5:14 Sam James
2021-07-23 18:00 Sam James
2021-07-17 23:33 Andreas K. Hüttel
2021-07-17 23:33 Andreas K. Hüttel
2021-07-17 17:12 Andreas K. Hüttel
2021-07-16  3:58 Sam James
2021-07-14 20:46 Andreas K. Hüttel
2021-07-02  2:30 Sam James
2021-06-26 12:05 Sergei Trofimovich
2021-06-26  1:34 Sam James
2021-06-24 21:03 Sergei Trofimovich
2021-06-22 19:45 Sam James
2021-06-22 18:57 Sergei Trofimovich
2021-06-21  6:19 Agostino Sarubbo
2021-06-21  6:19 Agostino Sarubbo
2021-06-21  6:18 Agostino Sarubbo
2021-06-19 23:51 Sam James
2021-06-19 23:51 Sam James
2021-06-19  9:01 Sergei Trofimovich
2021-06-18 10:23 Sergei Trofimovich
2021-06-18 10:04 Sergei Trofimovich
2021-06-17  5:03 Sam James
2021-06-01  6:59 Agostino Sarubbo
2021-06-01  6:32 Agostino Sarubbo
2021-05-02  7:10 Patrick McLean
2021-03-05 20:27 Sam James
2021-02-22  2:21 Joshua Kinard
2021-02-03  0:38 Andreas K. Hüttel
2020-12-13  0:16 Sam James
2020-12-10  2:51 Matt Turner
2020-11-28 11:26 Sergei Trofimovich
2020-10-24 11:05 Sergei Trofimovich
2020-10-24 11:04 Sergei Trofimovich
2020-10-24 11:01 Sergei Trofimovich
2020-10-24 11:00 Sergei Trofimovich
2020-10-23  1:01 Sam James
2020-10-23  0:54 Sam James
2020-09-12  4:40 Patrick McLean
2020-08-05 14:17 Agostino Sarubbo
2020-06-23 18:47 Patrick McLean
2020-04-11 19:03 Patrick McLean
2020-02-15 10:03 David Seifert
2020-02-08  0:51 Patrick McLean
2020-02-08  0:29 Patrick McLean
2020-02-07  3:41 Patrick McLean
2020-02-07  0:13 Patrick McLean
2020-01-22 19:25 Patrick McLean
2019-11-07  6:03 Patrick McLean
2019-11-05  5:34 Patrick McLean

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1710127730.03f1639e36e33a7d85b9fb09f4799067fe45a984.floppym@gentoo \
    --to=floppym@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox