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.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 92CE715800A for ; Wed, 2 Aug 2023 10:46:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B259FE0CC9; Wed, 2 Aug 2023 10:46:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9928DE0CC9 for ; Wed, 2 Aug 2023 10:46:17 +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 B34D0335CE3 for ; Wed, 2 Aug 2023 10:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E384FEB2 for ; Wed, 2 Aug 2023 10:46:14 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1690972711.ff400d7539fc97a478f50776d449e922ec1e3ea7.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/pari/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/pari/pari-2.15.4-r1.ebuild sci-mathematics/pari/pari-2.15.4.ebuild X-VCS-Directories: sci-mathematics/pari/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: ff400d7539fc97a478f50776d449e922ec1e3ea7 X-VCS-Branch: master Date: Wed, 2 Aug 2023 10:46:14 +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: 5990240a-7c96-4699-8763-d7b0ce6f8c9f X-Archives-Hash: 409372fb95a1a5e0004bcaaebe30b478 commit: ff400d7539fc97a478f50776d449e922ec1e3ea7 Author: Michael Orlitzky gentoo org> AuthorDate: Wed Aug 2 02:21:46 2023 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Wed Aug 2 10:38:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff400d75 sci-mathematics/pari: new revision to fix USE=X handling Pari's build system is interesting, and choosing a graphics library (for use in plotting) is... not straightforward. We have two patches that affect it, and still nobody has noticed in all this time that USE=X does precisely nothing at all. I've just sent one of those patches, for building against fltk, upstream. To avoid having to reroll the other patch and add an X11 case to it, this revision switches from using e.g. the "--with-fltk" flag to using "--graphic=fltk" instead. This turns out to be a stronger hint to the build system, and more imporantly supports both none/X11 as options, unlike --with-foo. Hopefully it allows us to go patch-free with the next release of pari. Signed-off-by: Michael Orlitzky gentoo.org> .../pari/{pari-2.15.4.ebuild => pari-2.15.4-r1.ebuild} | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/pari/pari-2.15.4.ebuild b/sci-mathematics/pari/pari-2.15.4-r1.ebuild similarity index 84% rename from sci-mathematics/pari/pari-2.15.4.ebuild rename to sci-mathematics/pari/pari-2.15.4-r1.ebuild index 4869bbe3d995..f7363f67f698 100644 --- a/sci-mathematics/pari/pari-2.15.4.ebuild +++ b/sci-mathematics/pari/pari-2.15.4-r1.ebuild @@ -16,6 +16,7 @@ LICENSE="GPL-2" SLOT="0/8" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="data doc examples fltk gmp test threads X" +REQUIRED_USE="fltk? ( !X )" # mutually exclusive plot implementations RESTRICT="!test? ( test )" BDEPEND=" @@ -31,6 +32,9 @@ DEPEND=" X? ( x11-libs/libX11:0= )" RDEPEND="${DEPEND}" +# Both of these should be obsolete in the next version. I've sent the +# fltk CXXFLAGS bit upstream, and using --graphic= hopefully works +# around the automagic parts. PATCHES=( "${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch "${FILESDIR}/${PN}"-2.11.2-no-automagic.patch @@ -71,6 +75,13 @@ src_configure() { # expecting a compiler driver. See bugs 722090 and 871117. # DLLDFLAGS, on the other hand, is used exactly like LDFLAGS would # be in a less-weird build system. + # + # There's a lot of automagic involved in the graphics detection. We + # first pass --graphic=none, which disables some of it. We then pass + # --graphic=fltk (or --graphic=X11) only if USE=fltk (or USE=X) is + # set. This is a stronger hint to the build system than --with-fltk + # would be, and importantly does not rely on the corresponding but + # nonexistent(!) option option for X11. LD="" DLLD="$(tc-getCC)" DLLDFLAGS="${LDFLAGS}" ./Configure \ --prefix="${EPREFIX}"/usr \ --datadir="${EPREFIX}/usr/share/${PN}" \ @@ -80,9 +91,10 @@ src_configure() { --with-readline="${EPREFIX}"/usr \ --with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \ --with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with fltk) \ + --graphic=none \ + $(usex X --graphic=X11 "" "" "") \ + $(usex fltk --graphic=fltk "" "" "") \ $(use_with gmp) \ - --without-qt \ $(usex threads "--mt=pthread" "" "" "") \ || die "./Configure failed" }