Hi, Here's an update to ECL. Quickly tested on amd64, tests pass and loading few libraries with quicklisp works as expected. Note that this makes one test fail on math/maxima but its caused by fpe exception handling. for details: https://gitlab.com/embeddable-common-lisp/ecl/issues/307
Timo Index: Makefile =================================================================== RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- Makefile 13 Oct 2016 15:14:29 -0000 1.31 +++ Makefile 19 Dec 2016 20:13:39 -0000 @@ -6,9 +6,9 @@ CATEGORIES = lang BROKEN-mips64 = ecl_min fails BROKEN-arm = infinite loop while building -V = 16.1.2 +V = 16.1.3 DISTNAME = ecl-$V -SHARED_LIBS += ecl 5.0 +SHARED_LIBS += ecl 6.0 HOMEPAGE = https://common-lisp.net/project/ecl/ @@ -20,6 +20,7 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = ${HOMEPAGE}static/files/release/ +USE_GMAKE = Yes CONFIGURE_STYLE = gnu TEST_TARGET = check CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ Index: distinfo =================================================================== RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo 13 Mar 2016 00:18:19 -0000 1.8 +++ distinfo 19 Dec 2016 20:13:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k= -SIZE (ecl-16.1.2.tgz) = 7449461 +SHA256 (ecl-16.1.3.tgz) = dqWFxhbo+oOmtyCTJaMJ2lvAymjgZY85b0mVVjgRElQ= +SIZE (ecl-16.1.3.tgz) = 7459212 Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.5 diff -u -p -r1.5 patch-src_Makefile_in --- patches/patch-src_Makefile_in 29 Aug 2015 14:48:34 -0000 1.5 +++ patches/patch-src_Makefile_in 19 Dec 2016 20:13:39 -0000 @@ -1,10 +1,10 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 2015/08/29 14:48:34 jasper Exp $ ---- src/Makefile.in.orig Mon Aug 24 15:25:08 2015 -+++ src/Makefile.in Mon Aug 24 15:28:43 2015 -@@ -173,30 +173,15 @@ install: +--- src/Makefile.in.orig Mon Dec 19 21:24:59 2016 ++++ src/Makefile.in Mon Dec 19 21:27:43 2016 +@@ -296,30 +296,15 @@ install: + for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ + $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ done - $(RM) -f $(DESTDIR)$(includedir)/ecl/config.h - mv $(DESTDIR)$(includedir)/ecl/config-install.h $(DESTDIR)$(includedir)/ecl/config.h + $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir) - for i in build-stamp help.doc TAGS ; do \ @@ -27,8 +27,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 20 - fi + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so - $(INSTALL_PROGRAM) c/dpp$(EXE) $(DESTDIR)$(ecldir) - $(INSTALL_PROGRAM) ecl_min$(EXE) $(DESTDIR)$(ecldir) + $(INSTALL_PROGRAM) $(DPP) $(DESTDIR)$(ecldir) + $(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir) for i in `cat modules`; do \ case $$i in \ - *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ Index: patches/patch-src_compile_lsp_in =================================================================== RCS file: /cvs/ports/lang/ecl/patches/patch-src_compile_lsp_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-src_compile_lsp_in --- patches/patch-src_compile_lsp_in 29 Aug 2015 14:48:34 -0000 1.3 +++ patches/patch-src_compile_lsp_in 19 Dec 2016 20:13:39 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_compile_lsp_in,v 1.3 2015/08/29 14:48:34 jasper Exp $ ---- src/compile.lsp.in.orig Mon Aug 24 15:32:27 2015 -+++ src/compile.lsp.in Mon Aug 24 15:35:06 2015 -@@ -71,19 +71,19 @@ +--- src/compile.lsp.in.orig Mon Dec 19 21:27:57 2016 ++++ src/compile.lsp.in Mon Dec 19 21:29:57 2016 +@@ -74,19 +74,19 @@ "@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@") #+(and :wants-dlopen (not nonstop)) (setf c::*ld-flags* @@ -9,10 +9,10 @@ $OpenBSD: patch-src_compile_lsp_in,v 1.3 + "@LDFLAGS@ -L. -lecl @LIBS@" c::*ld-shared-flags* - "@SHARED_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @FASL_LIBS@ @LIBS@" -+ "@SHARED_LDFLAGS@ @LDFLAGS@ -L. -lecl @LIBS@ @FASL_LIBS@" ++ "@SHARED_LDFLAGS@ @LDFLAGS@ -L. -lecl @FASL_LIBS@ @LIBS@" c::*ld-bundle-flags* - "@BUNDLE_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @FASL_LIBS@ @LIBS@") -+ "@BUNDLE_LDFLAGS@ @LDFLAGS@ -L -lecl @FASL_LIBS@ @LIBS@") ++ "@BUNDLE_LDFLAGS@ @LDFLAGS@ -L. -lecl @FASL_LIBS@ @LIBS@") ;;; FIXME: The nonstop platform does not support soname #+(and :wants-dlopen nonstop) (setf c::*ld-flags* @@ -20,10 +20,10 @@ $OpenBSD: patch-src_compile_lsp_in,v 1.3 + "@LDFLAGS@ -Wld=-L.,-lecl @LIBS@" c::*ld-shared-flags* - "@SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @FASL_LIBS@ @LIBS@" -+ "@SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-L.,-lecl @LIBS@ @FASL_LIBS@" ++ "@SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-L.,-lecl @FASL_LIBS@ @LIBS@" c::*ld-bundle-flags* - "@BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @FASL_LIBS@ @LIBS@") -+ "@BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-L.,-lecl @LIBS@ @FASL_LIBS@") ++ "@BUNDLE_LDFLAGS@ @LDFLAGS@ -Wld=-L.,-lecl @FASL_LIBS@ @LIBS@") ;;; ;;; * Avoid name clashes with user supplied code. Index: patches/patch-src_configure =================================================================== RCS file: /cvs/ports/lang/ecl/patches/patch-src_configure,v retrieving revision 1.7 diff -u -p -r1.7 patch-src_configure --- patches/patch-src_configure 13 Mar 2016 00:18:19 -0000 1.7 +++ patches/patch-src_configure 19 Dec 2016 20:13:39 -0000 @@ -1,16 +1,16 @@ $OpenBSD: patch-src_configure,v 1.7 2016/03/13 00:18:19 juanfra Exp $ ---- src/configure.orig Thu Mar 10 22:19:22 2016 -+++ src/configure Thu Mar 10 22:20:21 2016 -@@ -4966,7 +4966,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" +--- src/configure.orig Mon Dec 19 21:30:13 2016 ++++ src/configure Mon Dec 19 21:31:37 2016 +@@ -4971,7 +4971,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" BUNDLE_LDFLAGS="-shared ${LDFLAGS}" ECL_LDRPATH="-Wl,--rpath,~A" - clibs="-lpthread -lm" + clibs="-lpthread ${clibs}" - SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION" + SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}" SONAME_LDFLAGS="-Wl,-soname,SONAME" ;; solaris*) -@@ -9455,7 +9455,7 @@ if test ${enable_shared} = "yes"; then +@@ -9509,7 +9509,7 @@ if test ${enable_shared} = "yes"; then $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/ecl/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 29 Aug 2015 14:48:34 -0000 1.7 +++ pkg/PLIST 19 Dec 2016 20:13:39 -0000 @@ -4,7 +4,9 @@ bin/ecl-config include/ecl/ include/ecl/bytecodes.h include/ecl/cache.h +include/ecl/config-internal.h include/ecl/config.h +include/ecl/configpre-int.h include/ecl/configpre.h include/ecl/cons.h include/ecl/cs.h @@ -25,10 +27,9 @@ include/ecl/number.h include/ecl/object.h include/ecl/page.h include/ecl/stacks.h -include/ecl/unify.h lib/ecl/ -lib/ecl/Copyright -lib/ecl/LGPL +lib/ecl/COPYING +lib/ecl/LICENSE lib/ecl/asdf.fas lib/ecl/cmp.asd lib/ecl/cmp.fas @@ -210,12 +211,15 @@ lib/ecl/libecl-cdb.a lib/ecl/libecl-curl.a lib/ecl/libecl-help.a lib/ecl/libecl-quicklisp.a +lib/ecl/libpackage-locks.a lib/ecl/libprofile.a lib/ecl/libql-minitar.a lib/ecl/librt.a lib/ecl/libsb-bsd-sockets.a lib/ecl/libserve-event.a lib/ecl/libsockets.a +lib/ecl/package-locks.asd +lib/ecl/package-locks.fas lib/ecl/prebuilt-asdf.asd lib/ecl/profile.asd lib/ecl/profile.fas
