commit: d613b8305ee7c4c982873fe5435622975a17ad7d Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 12 13:33:31 2022 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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} }
