CVS commit: pkgsrc/editors/emacs29

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug  7 15:20:07 UTC 2024

Modified Files:
        pkgsrc/editors/emacs29: Makefile options.mk

Log Message:
emacs29: switch to libjit from gcc14

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/editors/emacs29/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/editors/emacs29/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs29/Makefile
diff -u pkgsrc/editors/emacs29/Makefile:1.19 pkgsrc/editors/emacs29/Makefile:1.20
--- pkgsrc/editors/emacs29/Makefile:1.19        Thu Jul 11 19:53:34 2024
+++ pkgsrc/editors/emacs29/Makefile     Wed Aug  7 15:20:07 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2024/07/11 19:53:34 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2024/08/07 15:20:07 wiz Exp $
 
 CONFLICTS+=    emacs29-nox11-[0-9]*
 
-#PKGREVISION=  0
-PKGREVISION= 1
+PKGREVISION=   2
+
 .include "../../editors/emacs29/Makefile.common"
 
 .include "options.mk"

Index: pkgsrc/editors/emacs29/options.mk
diff -u pkgsrc/editors/emacs29/options.mk:1.7 pkgsrc/editors/emacs29/options.mk:1.8
--- pkgsrc/editors/emacs29/options.mk:1.7       Wed May 15 07:35:11 2024
+++ pkgsrc/editors/emacs29/options.mk   Wed Aug  7 15:20:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2024/05/15 07:35:11 jperkin Exp $
+# $NetBSD: options.mk,v 1.8 2024/08/07 15:20:07 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=                       PKG_OPTIONS.emacs
@@ -53,10 +53,10 @@ CONFIGURE_ARGS+=    --without-json
 ###
 .if !empty(PKG_OPTIONS:Mlibgccjit)
 CONFIGURE_ARGS+=       --with-native-compilation
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gcc13-libjit}/gcc13/lib
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gcc14-libjit}/gcc14/lib
 GENERATE_PLIST+=       cd ${DESTDIR}${PREFIX} && \
         ${FIND} lib/emacs/${PKGVERSION_NOREV}/native-lisp/ \( -type f -o -type l \) -print | ${SORT};
-.  include "../../lang/gcc13-libjit/buildlink3.mk"
+.  include "../../lang/gcc14-libjit/buildlink3.mk"
 PLIST.native=          yes
 .else
 PLIST.nonative=                yes