From nobody Sun Nov 06 15:23:37 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N4yn539btz4hQRr; Sun, 6 Nov 2022 15:23:37 +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 4N4yn52f6gz3brk; Sun, 6 Nov 2022 15:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667748217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PpaNvrAdv8KeSFpnXdZuafdzBW7jkRREKpbMPmxZya0=; b=KaIlUQabJdDt1gTuKllk9MgMOV3bSrgsuVCeOa5uC3rNwdtag19O2mfmwxOnRC8wABmv+z y2Q47XYdK4XoO61fU9t3SdhPiFUCMkaiiOzoX8gb1RZGQLdq4vNyRDS/Um+F7WppZLnoPH um9oULkkTkg7EhbukxRhqUB1RTiAjA5aELaraLoZ1srOhLyg10IRIlxYOE+cGt3SP1b/pc fw2eYZZzQWrQNyFWWmvWoI2awefI2P9VsDgoVSzTv/X87BLGtVuTkJuh4cRIf4iMpnGRyr M25GCFoCCBXAIfO+JK8ufogJLhy592Hyqf5v09z+gtHIaZnbUAor7rWi6Yvb+g== 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 4N4yn51gYvzPnv; Sun, 6 Nov 2022 15:23:37 +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 2A6FNbwM068278; Sun, 6 Nov 2022 15:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6FNbYR068276; Sun, 6 Nov 2022 15:23:37 GMT (envelope-from git) Date: Sun, 6 Nov 2022 15:23:37 GMT Message-Id: <202211061523.2A6FNbYR068276@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: 8882913727d6 - main - Emacs ports: Build using GCC when NATIVECOMP is on List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 8882913727d63c2323555bedb6f9c20bd4007ab2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667748217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PpaNvrAdv8KeSFpnXdZuafdzBW7jkRREKpbMPmxZya0=; b=rju1VqioiZ4ywB1zvqO1ZOuupGhlPgFAaNBXHlNVYq6WQiG7QxbQI5x/BDU6lGppkej7kH UlVB7epwDQmNc5EokCzmUnBk+E9DsUNHJSMklxkPlqGJkW6tRaC8XL/cayvwkeGPSJDTgb bqhImY6nGsExyr+CdYGebixnhWxpc8J7GhzEddcJ7+tfL9VHN1m4kGDdLsUQt7ecskQ8hD mirpB3an3USM1tGZ1pB4LuAqLjOXqvctIsKHMMgB1nAv9oeJpFgt0pf+AUwE0j2pXZiNOt JpbyckCYR4mdWc+rQ8LkYzudNYmCcRg4t6P9sP1SAsgs6KfbNFB0eX0qIJrZig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667748217; a=rsa-sha256; cv=none; b=iIRNP5V4m0mxnoIyGx2cQhVIV9KKiU5FcDyB54/rdZZzzbamhrrSo4ikzgvTHO3un52f3C G+rhyDm5OIgvrpZPHki2S2SxZKABk/OwiNkXTQ8n2VxpbkJvNxZU9SgN/oXd0j5Z4FaxiR lqt9Dl556hQPliguWd4T4Ih2fbwT09/ulgWXRMii+eUxDZ0QKKL2J15szleHlBnaBg52xH Xm6VZODyUyDI7BXySoF2KWgibVMZGbyTthkVdDze55vsw1tTjZ2nOmuCjO06Fc1Hy+v2vO 9ZoAwEd1gWoBKbdL8tTatO25vPycQtFOZbWUhzDy6VWUw/VYeN04Xy70dI29TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=8882913727d63c2323555bedb6f9c20bd4007ab2 commit 8882913727d63c2323555bedb6f9c20bd4007ab2 Author: Joseph Mingrone AuthorDate: 2022-11-05 03:01:05 +0000 Commit: Joseph Mingrone 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 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 -.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