diff options
| author |   Mike Gilbert <[email protected]> | 2025-02-19 22:57:09 -0500 |
|---|---|---|
| committer | Mike Gilbert <[email protected]> | 2025-02-21 11:36:37 -0500 |
| commit | 512953539d79ad8c4b0b97375b6d29f5932c1d46 (patch) | |
| tree | 5ffa151eaff41f97678aca8546c70c48c444a972 | |
| parent | dev-python/pyside: drop 6.8.1.1 (diff) | |
| download | gentoo-512953539d79ad8c4b0b97375b6d29f5932c1d46.tar.gz gentoo-512953539d79ad8c4b0b97375b6d29f5932c1d46.tar.bz2 gentoo-512953539d79ad8c4b0b97375b6d29f5932c1d46.zip | |
sys-libs/libxcrypt: restore hack to reset CC based on CTARGET
Closes: https://bugs.gentoo.org/949976
Signed-off-by: Mike Gilbert <[email protected]>
| -rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild | 16 | ||||
| -rw-r--r-- | sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild | 14 |
2 files changed, 17 insertions, 13 deletions
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild index 6bca15f08f61..31934e95cd77 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.36-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2004-2024 Gentoo Authors +# Copyright 2004-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -116,6 +116,14 @@ src_configure() { MYSYSROOT=${ESYSROOT} if target_is_not_host; then + # Hack to work around missing TARGET_CC support. + # See bug 949976. + if tc-is-clang; then + export CC="${CTARGET}-clang" + else + export CC="${CTARGET}-gcc" + fi + local CHOST=${CTARGET} MYPREFIX= @@ -126,12 +134,6 @@ src_configure() { multilib_env ABI=${DEFAULT_ABI} - tc-getCC >/dev/null - if [[ ${CC} != ${CHOST}-* ]]; then - unset CC - tc-getCC >/dev/null - fi - strip-unsupported-flags fi diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild index b4006c5176ff..566750ba0d8d 100644 --- a/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild +++ b/sys-libs/libxcrypt/libxcrypt-4.4.38.ebuild @@ -116,6 +116,14 @@ src_configure() { MYSYSROOT=${ESYSROOT} if target_is_not_host; then + # Hack to work around missing TARGET_CC support. + # See bug 949976. + if tc-is-clang; then + export CC="${CTARGET}-clang" + else + export CC="${CTARGET}-gcc" + fi + local CHOST=${CTARGET} MYPREFIX= @@ -126,12 +134,6 @@ src_configure() { multilib_env ABI=${DEFAULT_ABI} - tc-getCC >/dev/null - if [[ ${CC} != ${CHOST}-* ]]; then - unset CC - tc-getCC >/dev/null - fi - strip-unsupported-flags fi |