From 862016085406296d0b7996619420171cf74d99b1 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 3 Mar 2025 07:11:54 +0000 Subject: [PATCH] sys-libs/libxcrypt: Sync with Gentoo It's from Gentoo commit 1d04fa37e49523fc98d0992af4889de36042666a. --- .../sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 6 ++++-- .../sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild | 6 ++++-- .../portage-stable/sys-libs/libxcrypt/metadata.xml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild index 31934e95cd..ee2c2f74d1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild @@ -138,9 +138,11 @@ src_configure() { fi if use headers-only; then - # Nothing is compiled here which would affect the headers for the target. - # So forcing CC is sane. + # Nothing is compiled which would affect the headers, so we set + # CC and PKG_CONFIG to ensure configure passes without defaulting + # to the unprefixed host variants e.g. "pkg-config" local -x CC="$(tc-getBUILD_CC)" + local -x PKG_CONFIG="false" fi # Avoid possible "illegal instruction" errors with gold diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild index 566750ba0d..42cb9b1e24 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild @@ -138,9 +138,11 @@ src_configure() { fi if use headers-only; then - # Nothing is compiled here which would affect the headers for the target. - # So forcing CC is sane. + # Nothing is compiled which would affect the headers, so we set + # CC and PKG_CONFIG to ensure configure passes without defaulting + # to the unprefixed host variants e.g. "pkg-config" local -x CC="$(tc-getBUILD_CC)" + local -x PKG_CONFIG="false" fi # Doesn't work with LTO: bug #852917. diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/metadata.xml index cef5e501f6..ff23f0d0be 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libxcrypt/metadata.xml @@ -13,7 +13,7 @@ Build with compatibility interfaces for other crypt implementations Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version) - Build and install only the headers. + Build and install only the headers. This is mostly useful for toolchain bootstrapping, to avoid circular deps. besser82/libxcrypt