From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8811D15813A for ; Tue, 21 Jan 2025 19:11:55 +0000 (UTC) Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 5E615335C11 for ; Tue, 21 Jan 2025 19:11:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70E34E01E4; Tue, 21 Jan 2025 19:11:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18DCCE01E4 for ; Tue, 21 Jan 2025 19:11:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 089D7335C11 for ; Tue, 21 Jan 2025 19:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC43797F for ; Tue, 21 Jan 2025 19:11:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1737486577.4293d2054dd7a1a2edd5bd5964bfada7342d66a7.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild X-VCS-Directories: sys-libs/pam/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4293d2054dd7a1a2edd5bd5964bfada7342d66a7 X-VCS-Branch: master Date: Tue, 21 Jan 2025 19:11:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3351ce0-6ead-4334-a0ee-ad51d4d21997 X-Archives-Hash: e0924cd7b03d931fd27faec7248c42d2 commit: 4293d2054dd7a1a2edd5bd5964bfada7342d66a7 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jan 21 19:09:37 2025 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jan 21 19:09:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4293d205 sys-libs/pam: use a cross file for stubs when cross-compiling Closes: https://bugs.gentoo.org/948458 Signed-off-by: Mike Gilbert gentoo.org> sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild index e1e1c79a8d0e..e9bcba737b4f 100644 --- a/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild +++ b/sys-libs/pam/pam-1.7.0_p20241230-r3.ebuild @@ -9,7 +9,7 @@ MY_P="Linux-${PN^^}-${PV}" # Can reconsider w/ EAPI 8 and IDEPEND, bug #810979 TMPFILES_OPTIONAL=1 -inherit db-use fcaps flag-o-matic meson-multilib +inherit db-use fcaps flag-o-matic meson-multilib toolchain-funcs DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)" HOMEPAGE="https://github.com/linux-pam/linux-pam" @@ -78,11 +78,11 @@ src_configure() { } multilib_src_configure() { - local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local + local machine_file="${T}/meson.${CHOST}.${ABI}.ini.local" # Workaround for docbook5 not being packaged (bug #913087#c4) # It's only used for validation of output, so stub it out. # Also, stub out elinks+w3m which are only used for an index. - cat >> ${native_file} <<-EOF || die + cat >> "${machine_file}" <<-EOF || die [binaries] xmlcatalog='true' xmllint='true' @@ -90,9 +90,15 @@ multilib_src_configure() { w3m='true' EOF - local emesonargs=( - --native-file "${native_file}" + local emesonargs=() + if tc-is-cross-compiler; then + emesonargs+=( --cross-file "${machine_file}" ) + else + emesonargs+=( --native-file "${machine_file}" ) + fi + + emesonargs+=( $(meson_feature audit) $(meson_native_use_bool examples) $(meson_use debug pam-debug)