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 2F3A913933E for ; Sun, 11 Jul 2021 22:02:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A55CE0C87; Sun, 11 Jul 2021 22:02:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DCB51E0C3D for ; Sun, 11 Jul 2021 22:02:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F8B1342AE5 for ; Sun, 11 Jul 2021 22:02:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 315BE7C2 for ; Sun, 11 Jul 2021 22:02:30 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1626040930.cbc076540f6fc01308819a1cb21cd10df53c484b.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/postgresql/postgresql-13.3.ebuild dev-db/postgresql/postgresql-14_beta2.ebuild dev-db/postgresql/postgresql-9999.ebuild X-VCS-Directories: dev-db/postgresql/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: cbc076540f6fc01308819a1cb21cd10df53c484b X-VCS-Branch: master Date: Sun, 11 Jul 2021 22:02:30 +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: e3bdceb4-17ad-4986-a732-d2779b75804d X-Archives-Hash: 6f56fac75fbaac8fd44af8463ead50ed commit: cbc076540f6fc01308819a1cb21cd10df53c484b Author: Marek Szuba gentoo org> AuthorDate: Sun Jul 11 20:09:25 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sun Jul 11 22:02:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc07654 dev-db/postgresql: disable spinlocks on riscv No native spinlock support for this arch yet, not even in Git head. Signed-off-by: Marek Szuba gentoo.org> dev-db/postgresql/postgresql-13.3.ebuild | 12 +++++++++--- dev-db/postgresql/postgresql-14_beta2.ebuild | 12 +++++++++--- dev-db/postgresql/postgresql-9999.ebuild | 12 +++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dev-db/postgresql/postgresql-13.3.ebuild b/dev-db/postgresql/postgresql-13.3.ebuild index d71750a1cb7..2e2bf1e36a3 100644 --- a/dev-db/postgresql/postgresql-13.3.ebuild +++ b/dev-db/postgresql/postgresql-13.3.ebuild @@ -134,14 +134,13 @@ src_configure() { [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp" fi - econf \ + local myconf="\ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \ --datadir="${PO}/usr/share/postgresql-${SLOT}" \ --includedir="${PO}/usr/include/postgresql-${SLOT}" \ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \ --with-system-tzdata="${PO}/usr/share/zoneinfo" \ - $(use_enable !alpha spinlocks) \ $(use_enable debug) \ $(use_enable threads thread-safety) \ $(use_with icu) \ @@ -159,7 +158,14 @@ src_configure() { $(use_with xml libxml) \ $(use_with xml libxslt) \ $(use_with zlib) \ - $(use_enable nls) + $(use_enable nls)" + if use alpha || use riscv; then + myconf+=" --disable-spinlocks" + else + # Should be the default but just in case + myconf+=" --enable-spinlocks" + fi + econf ${myconf} } src_compile() { diff --git a/dev-db/postgresql/postgresql-14_beta2.ebuild b/dev-db/postgresql/postgresql-14_beta2.ebuild index a9630c760e8..e6463312ebc 100644 --- a/dev-db/postgresql/postgresql-14_beta2.ebuild +++ b/dev-db/postgresql/postgresql-14_beta2.ebuild @@ -135,14 +135,13 @@ src_configure() { [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp" fi - econf \ + local myconf="\ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \ --datadir="${PO}/usr/share/postgresql-${SLOT}" \ --includedir="${PO}/usr/include/postgresql-${SLOT}" \ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \ --with-system-tzdata="${PO}/usr/share/zoneinfo" \ - $(use_enable !alpha spinlocks) \ $(use_enable debug) \ $(use_enable threads thread-safety) \ $(use_with icu) \ @@ -161,7 +160,14 @@ src_configure() { $(use_with xml libxml) \ $(use_with xml libxslt) \ $(use_with zlib) \ - $(use_enable nls) + $(use_enable nls)" + if use alpha || use riscv; then + myconf+=" --disable-spinlocks" + else + # Should be the default but just in case + myconf+=" --enable-spinlocks" + fi + econf ${myconf} } src_compile() { diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild index 106cb9fb88f..8bdc4467a14 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -151,14 +151,13 @@ src_configure() { [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp" fi - econf \ + local myconf="\ --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \ --datadir="${PO}/usr/share/postgresql-${SLOT}" \ --includedir="${PO}/usr/include/postgresql-${SLOT}" \ --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \ --sysconfdir="${PO}/etc/postgresql-${SLOT}" \ --with-system-tzdata="${PO}/usr/share/zoneinfo" \ - $(use_enable !alpha spinlocks) \ $(use_enable debug) \ $(use_enable nls) \ $(use_enable threads thread-safety) \ @@ -177,7 +176,14 @@ src_configure() { $(use_with xml libxslt) \ $(use_with zlib) \ $(use_with systemd) \ - ${uuid_config} + ${uuid_config}" + if use alpha || use riscv; then + myconf+=" --disable-spinlocks" + else + # Should be the default but just in case + myconf+=" --enable-spinlocks" + fi + econf ${myconf} } src_compile() {