Date: Sun, 06 Nov 2022 11:33:48 -0400 From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org Cc: dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 8882913727d6 - main - Emacs ports: Build using GCC when NATIVECOMP is on Message-ID: <86mt94nllv.fsf@phe.ftfl.ca> In-Reply-To: <202211061523.2A6FNbYR068276@gitrepo.freebsd.org> (Joseph Mingrone's message of "Sun, 6 Nov 2022 15:23:37 GMT") References: <202211061523.2A6FNbYR068276@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-= Content-Type: text/plain On Sun, 2022-11-06 at 15:23, Joseph Mingrone <jrm@FreeBSD.org> wrote: > The branch main has been updated by jrm: > URL: https://cgit.FreeBSD.org/ports/commit/?id=8882913727d63c2323555bedb6f9c20bd4007ab2 > commit 8882913727d63c2323555bedb6f9c20bd4007ab2 > Author: Joseph Mingrone <jrm@FreeBSD.org> > AuthorDate: 2022-11-05 03:01:05 +0000 > Commit: Joseph Mingrone <jrm@FreeBSD.org> > CommitDate: 2022-11-06 15:22:02 +0000 > Emacs ports: Build using GCC when NATIVECOMP is on > In order to allow concurrent installation, the GCC ports, as of 0338e04, > moved some header files to internal locations. Emacs built with > NATIVECOMP requires GCC jit libraries. Rather than patching Emacs to > search in those internal locations, build Emacs with GCC when NATIVECOMP > is turned on. > PR: 257060 > Tested by: jcfyecrayz@liamekaens.com, yasu ^ Oops. Should have also included salvadore. > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D37275 > --- > editors/emacs-devel/Makefile | 8 ++------ > editors/emacs/Makefile | 8 ++------ > 2 files changed, 4 insertions(+), 12 deletions(-) > diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile > index 24a14c21c8d0..6eb710e2eda0 100644 > --- a/editors/emacs-devel/Makefile > +++ b/editors/emacs-devel/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= emacs > DISTVERSION= 29.0.50.20221031 > +PORTREVISION= 1 > PORTEPOCH= 2 > CATEGORIES= editors > PKGNAMESUFFIX= -devel > @@ -171,10 +172,9 @@ MAILUTILS_CONFIGURE_WITH= mailutils > MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_lib_lockfile_maillock=no \ > ac_cv_prog_liblockfile=no > MODULES_CONFIGURE_WITH= modules > -NATIVECOMP_LIB_DEPENDS= libgccjit.so:lang/${_GCC_PORT} > +NATIVECOMP_USE= GCC=11+ > NATIVECOMP_CONFIGURE_WITH= native-compilation > NATIVECOMP_MAKE_ARGS= NATIVE_FULL_AOT=1 > -NATIVECOMP_LDFLAGS= -L${LOCALBASE}/lib/${_GCC_PORT} > OSS_CONFIGURE_ON= --with-sound=oss > OTF_LIB_DEPENDS= libotf.so:print/libotf > OTF_CONFIGURE_WITH= libotf > @@ -230,10 +230,6 @@ NATIVECOMP_COMMENT_END= '*/' > NATIVECOMP_COMMENT_START= '/*' > .endif > -.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN) > -_GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes > -.endif > - > .if ${FLAVOR:U} != nox > USES+= desktop-file-utils gnome > .if !${PORT_OPTIONS:MPGTK} > diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile > index 74dde03bc798..816a4427d472 100644 > --- a/editors/emacs/Makefile > +++ b/editors/emacs/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= emacs > DISTVERSION= 28.2 > +PORTREVISION= 1 > PORTEPOCH= 3 > CATEGORIES= editors > MASTER_SITES= GNU > @@ -182,10 +183,9 @@ MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_lib_lockfile_maillock=no \ > MODULES_CONFIGURE_WITH= modules > MOTIF_USES= motif > MOTIF_CONFIGURE_ON= --with-x-toolkit=motif > -NATIVECOMP_LIB_DEPENDS= libgccjit.so:lang/${_GCC_PORT} > +NATIVECOMP_USE= GCC=11+ > NATIVECOMP_CONFIGURE_WITH= native-compilation > NATIVECOMP_MAKE_ARGS= NATIVE_FULL_AOT=1 > -NATIVECOMP_LDFLAGS= -L${LOCALBASE}/lib/${_GCC_PORT} > OSS_CONFIGURE_ON= --with-sound=oss > OTF_IMPLIES= XFT > OTF_LIB_DEPENDS= libotf.so:print/libotf > @@ -226,10 +226,6 @@ XWIDGETS_CONFIGURE_WITH= xwidgets > .include <bsd.port.options.mk> > -.if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN) > -_GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes > -.endif > - > .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} && \ > !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D} > CONFIGURE_ARGS+= --with-x-toolkit=no --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKkBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAmNn09xfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvnt25EACmyXGZ+LSQqxRktMnJrQUPYwuTr5LbaVvr aUIeJHpLzltmH+i6YguXUopRyJjyu+x42ZuGpGGFMN5d4s0r4n/mpCasgSy28U5v VI9AkoOKV/Fw81zbu/qmzQqv4YbCmdSZqQ3Ysd3VjIRzlJhC3pS9hmxCjOk6yduQ JwAtLxawdUfRPv+IVsDL95xGgJOxKQhS9Kf9FtrbP9kt17/acrun2tv5q21mWcPO RM+U06NDohBp69ie34YXG7+a4LxstetD5IKezrQPPeGkrUFZgQIYAN2AjkQbn0oS MWGcn25zsO5+BLson2nfsAJHj2xzJy0KWwNmrYkgKaJ2xjcYhRRQfUN8L+ctkoVB pEIEigOiby7oTX95JtIbVHhYzrwVUnrD8D/zEA0HVy6xp/r5l+QLRk/MeYLweDzs Y07vyBnl7gM95J76IRFOLSLfhI8oIT4l5FmuFmzw2c3+rAguWuniTE2hxYfeOiZt YSEjzoY9SR9P7xVnVvIT6WqJA9GsT3Mq67TInUcOxAxyl8/krK2nPzOUK+NhlJWt JYmJMOxPHylqL5bduDhJcdlBCgLquYkGqjz0tbON7kTW2GX+OJ5hJwfMOPuI9Y9K TzxIW5hNRzaaYGDZCCVsHaxEejnBMXcKq3CFAfRd6J0nykG/T9wC3pFwyCY8xCac 9pjKXzTPfQ== =RWTj -----END PGP SIGNATURE----- --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86mt94nllv.fsf>