From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1378332-garchives=archives.gentoo.org@lists.gentoo.org>
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 (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D07F715808B
for <garchives@archives.gentoo.org>; Mon, 21 Mar 2022 23:33:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B9731E089C;
Mon, 21 Mar 2022 23:33: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 294F6E089C
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2022 23:33:53 +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 E9612342DF0
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2022 23:33:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 426412EE
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Mar 2022 23:33:50 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1647905588.24631f38a61a53ffd2773090585eb98e9d4e8185.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/portage/portage-3.0.30-r1.ebuild sys-apps/portage/portage-9999.ebuild
X-VCS-Directories: sys-apps/portage/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 24631f38a61a53ffd2773090585eb98e9d4e8185
X-VCS-Branch: master
Date: Mon, 21 Mar 2022 23:33:50 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 62007f6f-c6d6-4e49-af5b-463710222b59
X-Archives-Hash: 26aaa820a07a788c94b7515ddfd216ee
commit: 24631f38a61a53ffd2773090585eb98e9d4e8185
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 23:33:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 23:33:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24631f38
sys-apps/portage: disable USE=native-extensions for cross-compilation
It doesn't work because cross-compiling Python modules is
either tricky or flat-out impossible, so let's disable
it when cross-compiling to make life easier for people.
Bug: https://bugs.gentoo.org/612158
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/portage/portage-3.0.30-r1.ebuild | 6 +++++-
sys-apps/portage/portage-9999.ebuild | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sys-apps/portage/portage-3.0.30-r1.ebuild b/sys-apps/portage/portage-3.0.30-r1.ebuild
index 590e0036a88a..87f2831cdf96 100644
--- a/sys-apps/portage/portage-3.0.30-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.30-r1.ebuild
@@ -76,6 +76,10 @@ PDEPEND="
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+ if use native-extensions && tc-is-cross-compiler; then
+ einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+ fi
+
check_extra_config
}
@@ -99,7 +103,7 @@ python_prepare_all() {
>> cnf/make.globals || die
fi
- if use native-extensions; then
+ if use native-extensions && ! tc-is-cross-compiler; then
printf "[build_ext]\nportage_ext_modules=true\n" >> \
setup.cfg || die
fi
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index c741638d18e9..860091097621 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -76,6 +76,10 @@ PDEPEND="
pkg_pretend() {
local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+ if use native-extensions && tc-is-cross-compiler; then
+ einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)"
+ fi
+
check_extra_config
}
@@ -93,7 +97,7 @@ python_prepare_all() {
>> cnf/make.globals || die
fi
- if use native-extensions; then
+ if use native-extensions && ! tc-is-cross-compiler; then
printf "[build_ext]\nportage_ext_modules=true\n" >> \
setup.cfg || die
fi