cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Emacs ports: Build using GCC when NATIVECOMP is on

Browse Source 
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
This commit is contained in:
Joseph Mingrone 2022-11-05 00:01:05 -03:00
parent 0338e04504
commit 8882913727
No known key found for this signature in database
GPG Key ID: 36A40C83B0D6EF9E
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/emacs-devel/Makefile
View File

@ -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}

8
editors/emacs/Makefile
View File

@ -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