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 AE60E158095 for ; Mon, 12 Sep 2022 13:40:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E5AEE09A8; Mon, 12 Sep 2022 13:39:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75972E09A5 for ; Mon, 12 Sep 2022 13:39:05 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F725340E25 for ; Mon, 12 Sep 2022 13:39:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30FAC5D9 for ; Mon, 12 Sep 2022 13:39:03 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1662989680.d613b8305ee7c4c982873fe5435622975a17ad7d.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-28.2.9999.ebuild app-editors/emacs/emacs-28.2.ebuild app-editors/emacs/emacs-29.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: d613b8305ee7c4c982873fe5435622975a17ad7d X-VCS-Branch: master Date: Mon, 12 Sep 2022 13:39:03 +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: 6cf2f7ba-69aa-4fc2-a488-98d04f19abef X-Archives-Hash: bd93ac82858563af92cc98da71cf3f3f commit: d613b8305ee7c4c982873fe5435622975a17ad7d Author: Ulrich Müller gentoo org> AuthorDate: Mon Sep 12 13:33:31 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Sep 12 13:34:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d613b830 app-editors/emacs: Override -zlib when jit is set Closes: https://bugs.gentoo.org/838361 Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-28.2.9999.ebuild | 14 ++++++++++++-- app-editors/emacs/emacs-28.2.ebuild | 14 ++++++++++++-- app-editors/emacs/emacs-29.0.9999.ebuild | 14 ++++++++++++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/app-editors/emacs/emacs-28.2.9999.ebuild b/app-editors/emacs/emacs-28.2.9999.ebuild index 8b050ba1f509..86750792fff3 100644 --- a/app-editors/emacs/emacs-28.2.9999.ebuild +++ b/app-editors/emacs/emacs-28.2.9999.ebuild @@ -51,7 +51,10 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - jit? ( sys-devel/gcc:=[jit(-)] ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) @@ -189,6 +192,14 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" fi + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -303,7 +314,6 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ - $(use_with zlib) \ ${myconf} } diff --git a/app-editors/emacs/emacs-28.2.ebuild b/app-editors/emacs/emacs-28.2.ebuild index de0ccc6dce2f..34a77555a2dc 100644 --- a/app-editors/emacs/emacs-28.2.ebuild +++ b/app-editors/emacs/emacs-28.2.ebuild @@ -54,7 +54,10 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - jit? ( sys-devel/gcc:=[jit(-)] ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) @@ -187,6 +190,14 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" fi + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -301,7 +312,6 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ - $(use_with zlib) \ ${myconf} } diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild index c88004a9780d..c016b6f1546a 100644 --- a/app-editors/emacs/emacs-29.0.9999.ebuild +++ b/app-editors/emacs/emacs-29.0.9999.ebuild @@ -101,7 +101,10 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - jit? ( sys-devel/gcc:=[jit(-)] ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) @@ -222,6 +225,14 @@ src_configure() { # Athena (Lucid), or no toolkit. They are enabled (in order of # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags. + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-pgtk --without-ns" @@ -353,7 +364,6 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ - $(use_with zlib) \ ${myconf} }