CVS commit: pkgsrc/lang/ecl

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Wed Sep  9 20:11:30 UTC 2026

Modified Files:
        pkgsrc/lang/ecl: Makefile options.mk

Log Message:
ecl: fixed buliding on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/ecl/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ecl/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/lang/ecl/Makefile
diff -u pkgsrc/lang/ecl/Makefile:1.31 pkgsrc/lang/ecl/Makefile:1.32
--- pkgsrc/lang/ecl/Makefile:1.31       Wed Jul 15 16:36:22 2026
+++ pkgsrc/lang/ecl/Makefile    Wed Sep  9 20:11:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2026/07/15 16:36:22 ktnb Exp $
+# $NetBSD: Makefile,v 1.32 2026/09/09 20:11:30 ktnb Exp $
 
 DISTNAME=              ecl-26.5.5
 CATEGORIES=            lang
@@ -10,20 +10,28 @@ HOMEPAGE=           https://common-lisp.net/proje
 COMMENT=               Embeddable Common Lisp
 LICENSE=               gnu-lgpl-v2
 
+USE_LANGUAGES= c c++
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake makeinfo
 INFO_FILES=            yes
-TEXINFO_REQD=          5.2
+TEXINFO_REQD+=         5.2
 
 CONFIGURE_ARGS+=       --enable-boehm=system --enable-gmp=system
 
-SUBST_CLASSES+=                        fix-libffi-include
-SUBST_STAGE.fix-libdir=                pre-configure
-SUBST_MESSAGE.fix-libdir=      Fixing libffi layout.
-SUBST_FILES.fix-libdir=                src/c/ffi.d
-SUBST_SED.fix-libdir=          -e '/include.*<ffi/ffi.h>/s:ffi/ffi.h:ffi.h:'
+SUBST_CLASSES+=                libdir
+SUBST_STAGE.libdir=    pre-configure
+SUBST_MESSAGE.libdir=  Fixing libffi layout.
+SUBST_FILES.libdir=    src/c/ffi.d
+SUBST_SED.libdir=      -e '/include.*<ffi/ffi.h>/s:ffi/ffi.h:ffi.h:'
+
+SUBST_CLASSES+=                rpath
+SUBST_STAGE.rpath=     pre-configure
+SUBST_MESSAGE.rpath=   Fixing rpath variable for Darwin.
+SUBST_FILES.rpath=     src/configure
+SUBST_SED.rpath=       -e 's,@rpath,${PREFIX}/lib/,g'
 
 .include "options.mk"
 

Index: pkgsrc/lang/ecl/options.mk
diff -u pkgsrc/lang/ecl/options.mk:1.12 pkgsrc/lang/ecl/options.mk:1.13
--- pkgsrc/lang/ecl/options.mk:1.12     Sun Nov  3 19:03:57 2019
+++ pkgsrc/lang/ecl/options.mk  Wed Sep  9 20:11:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2019/11/03 19:03:57 rillig Exp $
+# $NetBSD: options.mk,v 1.13 2026/09/09 20:11:30 ktnb Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ecl
 PKG_SUPPORTED_OPTIONS+=                debug threads unicode ffi
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=      --enable-debug
 
 .if !empty(PKG_OPTIONS:Mthreads)
 CONFIGURE_ARGS+=       --enable-threads
-CONFIGURE_ENV+=                THREAD_CFLAGS=${PTHREAD_CFLAGS:Q}
+CONFIGURE_ENV+=                THREAD_CFLAGS=${PTHREAD_CFLAGS:M*:Q}
 CONFIGURE_ENV+=                THREAD_LDFLAGS=${BUILDLINK_LDFLAGS.pthread:Q}
 CONFIGURE_ENV+=                THREAD_LIBS=${BUILDLINK_LIBS.pthread:Q}
 # XXX Although NetBSD-6+ supports TLS, ECL oddly crashes on startup