From nobody Sun Nov 06 15:33:48 2022 X-Original-To: dev-commits-ports-main@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 4N4z0t10wqz4hQys; Sun, 6 Nov 2022 15:33:50 +0000 (UTC) (envelope-from jrm@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N4z0t0Wdjz3cPV; Sun, 6 Nov 2022 15:33:50 +0000 (UTC) (envelope-from jrm@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667748830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=TvZmfpG39upfcwgC+u+Aju5h/AuLGOLXnGKF7/IfgDY=; b=lusIq7htVb/fiMCZVSN1wXxiqryPa9eTlOVcUhrnSkrLDiHNAiztgv1GF521Ylff/AwqUF wCWgrx6oRI4hJy0DwX1h/ixlhmDyaXbl0xSsQlK2LRxs2HdPdxlSALe3ej/xxQZAn2FC2c dKkxtfnjZo2sIkZRZjvdwndXmCGSVAumsZiKkHepLk6rwoNdjGodv5HYxzu7kAZWHPSJ/f Jn61Qhc2+zu6WPp/P9fPmTBPhNOwQ5f9v2XfgQrVHzWhblFIzuua+DAzJU0LspWCHEXpDw qDb2HHqUm5FBRPEIXW+oqCaF9KFC52onCZDCKplgonfWn5OVBuvM988GDwdVyA== Received: from phe.ftfl.ca.ftfl.ca (drmons0544w-142-167-138-122.dhcp-dynamic.fibreop.ns.bellaliant.net [142.167.138.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: jrm/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4N4z0s5FSgz16K1; Sun, 6 Nov 2022 15:33:49 +0000 (UTC) (envelope-from jrm@freebsd.org) From: Joseph Mingrone 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 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> Date: Sun, 06 Nov 2022 11:33:48 -0400 Message-ID: <86mt94nllv.fsf@phe.ftfl.ca> User-Agent: Gnus/5.13 (Gnus v5.13) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667748830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=TvZmfpG39upfcwgC+u+Aju5h/AuLGOLXnGKF7/IfgDY=; b=twsMCMDPkmYThQAKwqVZZVnug/nq6JuEAFoFDVuFArReu4NTPYt5vrIGvVxjTBviaSxnCr HXXBz+2lxz9PAmRPRDqgjVWlUKkXvQ2Q2w4QNFjox0iKPD/k8YaNFnWOPLLXmS7XkOPH75 pAH8d0ibSYBCuBjQzkrUTwlkG19VlvaFvfpqPPcjhdYeP91olmyR/4xqErj2GRRNLOcL4Q LDo47eXqlyqlQAD7suPtyHKCqidR7ikzD7HeHt0zmXRCISjEo1iXQ7ZZSLB5uWHOY9E+d3 vq6hXNlz/G746GIwmtja9UIWVAjVYT/lVU7J/Oa06/t5HYtWyJVd7Udl7iitqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667748830; a=rsa-sha256; cv=none; b=l2syDH9R3gEjTU09bnCb3Y1pG/E7RrpHj/drAWxuaQK2jOK9L83YHid/cvKgLk1b6LGk/M OVsitTHDusMAMNUjJ1tNMiRqMaP6k7hmdpLVseX2fS51MK7UWUG8RIuULdeOx43rAx3Llk LznKmz7bC6aqR5iIso7T60N547+SiunezfpPgAXRths09H19hULnUfKaY5pDUwZZantWfg VU8z6Z+ysM9yot7b7PxZGyovR2uw1P29Ext1knia6r68Ltrzi60ph5324yqK5P2HLH9sXS C38UXQKCU9co9FP4pWTAz8TkQ1HM9UIN/jSibXmvsZ3M5uC9kq5Nw9Wl1PT2ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --=-=-= Content-Type: text/plain On Sun, 2022-11-06 at 15:23, Joseph Mingrone wrote: > 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 ^ 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 > -.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----- --=-=-=--