Date: Tue, 7 Sep 2021 02:46:28 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 49a60393fc80 - main - editors/emacs-devel: Improve gcc port selection for NATIVECOMP Message-ID: <202109070246.1872kSHx034513@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=49a60393fc80385a88038b4cf34cfb88bb5992b0 commit 49a60393fc80385a88038b4cf34cfb88bb5992b0 Author: Yasuhiro Kimura <yasu@utahime.org> AuthorDate: 2021-09-06 22:16:08 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2021-09-07 02:44:59 +0000 editors/emacs-devel: Improve gcc port selection for NATIVECOMP PR: 256893 Differential Revision: https://reviews.freebsd.org/D31011 --- editors/emacs-devel/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 58d1ebbedd82..6e01414738a0 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= emacs DISTVERSION= 28.0.50.20210901 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= editors PKGNAMESUFFIX= -devel @@ -169,10 +170,10 @@ 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/gcc11 +NATIVECOMP_LIB_DEPENDS= libgccjit.so:lang/${_GCC_PORT} NATIVECOMP_CONFIGURE_WITH= native-compilation NATIVECOMP_MAKE_ARGS= NATIVE_FULL_AOT=1 -NATIVECOMP_LDFLAGS= -L${LOCALBASE}/lib/gcc11 +NATIVECOMP_LDFLAGS= -L${LOCALBASE}/lib/${_GCC_PORT} OSS_CONFIGURE_ON= --with-sound=oss OTF_IMPLIES= XFT OTF_LIB_DEPENDS= libotf.so:print/libotf @@ -210,6 +211,10 @@ 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 ${ARCH} == powerpc64le USE_GCC= yes .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109070246.1872kSHx034513>