From owner-dev-commits-ports-all@freebsd.org Tue Sep 7 02:46:29 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3685167F43D; Tue, 7 Sep 2021 02:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H3V5d0xhlz4c0d; Tue, 7 Sep 2021 02:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1924250C; Tue, 7 Sep 2021 02:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1872kSWN034514; Tue, 7 Sep 2021 02:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1872kSHx034513; Tue, 7 Sep 2021 02:46:28 GMT (envelope-from git) Date: Tue, 7 Sep 2021 02:46:28 GMT Message-Id: <202109070246.1872kSHx034513@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 49a60393fc80 - main - editors/emacs-devel: Improve gcc port selection for NATIVECOMP MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49a60393fc80385a88038b4cf34cfb88bb5992b0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2021 02:46:29 -0000 The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=49a60393fc80385a88038b4cf34cfb88bb5992b0 commit 49a60393fc80385a88038b4cf34cfb88bb5992b0 Author: Yasuhiro Kimura AuthorDate: 2021-09-06 22:16:08 +0000 Commit: Joseph Mingrone 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 +.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