From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97F9E158086 for ; Wed, 20 Oct 2021 04:01:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B667BE07FE; Wed, 20 Oct 2021 04:01:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DDF0E07FE for ; Wed, 20 Oct 2021 04:01:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 051B8343337 for ; Wed, 20 Oct 2021 04:01:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 689D2151 for ; Wed, 20 Oct 2021 04:01:18 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634702440.ed283b6255f2113865198fec01820b79b73708e3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/pam_wrapper/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/pam_wrapper/pam_wrapper-1.1.3-r1.ebuild sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild X-VCS-Directories: sys-libs/pam_wrapper/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ed283b6255f2113865198fec01820b79b73708e3 X-VCS-Branch: master Date: Wed, 20 Oct 2021 04:01:18 +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: 35d2fcdf-4692-492a-9898-5c51fd5e7c59 X-Archives-Hash: 145ad6486040c03ceb63aefa676ad7b0 commit: ed283b6255f2113865198fec01820b79b73708e3 Author: Sam James gentoo org> AuthorDate: Wed Oct 20 04:00:40 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 20 04:00:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed283b62 sys-libs/pam_wrapper: fix compile for multilib We don't want to try build Python bindings for the multilib ABI (it's pointless, it's only used for tests in other packages anyway). Closes: https://bugs.gentoo.org/737468 Signed-off-by: Sam James gentoo.org> ...1.1.3-r1.ebuild => pam_wrapper-1.1.3-r2.ebuild} | 46 ++++++++++++++++------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r1.ebuild b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild similarity index 52% rename from sys-libs/pam_wrapper/pam_wrapper-1.1.3-r1.ebuild rename to sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild index a95f837c4bb..65144032259 100644 --- a/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r1.ebuild +++ b/sys-libs/pam_wrapper/pam_wrapper-1.1.3-r2.ebuild @@ -19,7 +19,6 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" - RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -27,7 +26,6 @@ RDEPEND=" ${PYTHON_DEPS} sys-libs/pam:0=[${MULTILIB_USEDEP}] " - DEPEND=" ${RDEPEND} test? ( dev-util/cmocka[${MULTILIB_USEDEP}] ) @@ -35,26 +33,50 @@ DEPEND=" multilib_src_configure() { configure_for_python() { - local libpam="${EPREFIX}" - multilib_is_native_abi || libpam+="/usr" - libpam+="/$(get_libdir)/libpam.so.0" + local libpam="${EPREFIX}/$(get_libdir)/libpam.so.0" local mycmakeargs=( -DPAM_LIBRARY="${libpam}" - -DUNIT_TESTING=$(usex test) - -DPYTHON2_LIBRARY="/dev/null" # Disabled - -DPYTHON3_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON3_SITELIB="$(python_get_sitedir)" + -DUNIT_TESTING=OFF ) + cmake_src_configure } - python_foreach_impl configure_for_python + + if multilib_is_native_abi ; then + # Build the Pythons for each version (but only for the native ABI) + # bug #737468 + python_foreach_impl configure_for_python + fi + + # Do the regular build now + local libpam="${EPREFIX}" + multilib_is_native_abi || libpam+="/usr" + libpam+="/$(get_libdir)/libpam.so.0" + + local mycmakeargs=( + -DPAM_LIBRARY="${libpam}" + -DUNIT_TESTING=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Python{Libs,Interp,SiteLibs}=ON + ) + + cmake_src_configure } multilib_src_compile() { - python_foreach_impl cmake_src_compile + if multilib_is_native_abi ; then + python_foreach_impl cmake_src_compile + fi + + # Compile the "proper" version without Python last + cmake_src_compile } multilib_src_install() { - python_foreach_impl cmake_src_install + if multilib_is_native_abi ; then + python_foreach_impl cmake_src_install + fi + + # Install the "proper" version without Python last + cmake_src_install }