lang/ecl: update to 23.9.9
Hi, The following diff updates lang/ecl to 23.9.9. I tested it on amd64, and built reverse-depends using it (math/maxima, math/wxMaxima, net/clic, and lang/sbcl [forcing the use of ecl]). Comments or OK ? -- Sebastien Marie diff /home/semarie/repos/openbsd/ports commit - 774b5ac8593c8e368254a0c7382f33d6cdaeca56 path + /home/semarie/repos/openbsd/ports blob - 744e4fac01aa428f635a2e64735ab4a34982b365 file + lang/ecl/Makefile --- lang/ecl/Makefile +++ lang/ecl/Makefile @@ -1,12 +1,10 @@ COMMENT = embeddable common-lisp CATEGORIES = lang -V =21.2.1 +V =23.9.9 DISTNAME = ecl-$V -SHARED_LIBS += ecl 8.0 +SHARED_LIBS += ecl 9.0 -REVISION = 0 - HOMEPAGE = https://common-lisp.net/project/ecl/ MAINTAINER = Timo Myyra @@ -44,7 +42,7 @@ LIB_DEPENDS +=devel/gmp \ devel/boehm-gc,-atomic \ devel/libffi -TEST_DEPENDS = ${BASE_PKGPATH} +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \ "TEST_IMAGE=${WRKDIST}/build/bin/ecl" blob - 5da17098084bbc837811a12478849c7eb0b6024e file + lang/ecl/distinfo --- lang/ecl/distinfo +++ lang/ecl/distinfo @@ -1,2 +1,2 @@ -SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA= -SIZE (ecl-21.2.1.tgz) = 7875088 +SHA256 (ecl-23.9.9.tgz) = xRvatMpsEXPdP+nP6XJ7zvuXuwo9ZDS2J8pr2usz+IA= +SIZE (ecl-23.9.9.tgz) = 8129105 blob - a7763bffb61f13d0e7ff85917530a01dd3294ba7 file + lang/ecl/patches/patch-src_Makefile_in --- lang/ecl/patches/patch-src_Makefile_in +++ lang/ecl/patches/patch-src_Makefile_in @@ -1,7 +1,7 @@ Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -213,29 +213,13 @@ install: +@@ -201,29 +201,13 @@ install: $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ done $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir) blob - /dev/null file + lang/ecl/patches/patch-src_cmp_cmpbackend-cxx_cmpbackend-cxx_lsp (mode 640) --- /dev/null +++ lang/ecl/patches/patch-src_cmp_cmpbackend-cxx_cmpbackend-cxx_lsp @@ -0,0 +1,16 @@ +Index: src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp +--- src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp.orig src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp +@@ -274,11 +274,7 @@ the environment variable TMPDIR to a different value." + + (defun ecl-library-directory () + "Finds the directory in which the ECL core library was installed." +- (cond ((and *ecl-library-directory* +- (probe-file (merge-pathnames (compile-file-pathname "ecl" :type +-#+dlopen :shared-library +-#-dlopen :static-library) +- *ecl-library-directory*))) ++ (cond (*ecl-library-directory* + *ecl-library-directory*) + ((probe-file "SYS:BUILD-STAMP") + (setf *ecl-library-directory* (namestring (translate-logical-pathname "SYS:" blob - a863e03254c2b802909d695af5cb0e2066962947 file + /dev/null --- lang/ecl/patches/patch-src_cmp_cmpc-wt_lsp +++ /dev/null @@ -1,25 +0,0 @@ -backport https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4 - -Index: src/cmp/cmpc-wt.lsp src/cmp/cmpc-wt.lsp.orig -+++ src/cmp/cmpc-wt.lsp -@@ -19,18 +19,7 @@ - (defun wt1 (form) - (cond ((not (floatp form)) - (typecase form -- (INTEGER --(princ form *compiler-output1*) --(princ -- (cond ((typep form (rep-type->lisp-type :int)) "") -- ((typep form (rep-type->lisp-type :unsigned-int)) "U") -- ((typep form (rep-type->lisp-type :long)) "L") -- ((typep form (rep-type->lisp-type :unsigned-long)) "UL") -- ((typep form (rep-type->lisp-type :long-long)) "LL") -- ((typep form (rep-type->lisp-type :unsigned-long-long)) "ULL") -- (t (baboon :format-control "wt1: The number ~A doesn't fit any integer type." form))) -- *compiler-output1*)) -- ((or STRING CHARACTER) -+ ((or INTEGER STRING CHARACTER) - (princ form *compiler-output1*)) -(VAR (wt-var form)) -(t (wt-loc form blob - 12ec82db34881b8159569d96e80a0e9649a32f3c file + /dev/null --- lang/ecl/patches/patch-src_cmp_cmploc_lsp +++ /dev/null @@ -1,36 +0,0 @@ -backport https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4 - -Index: src/cmp/cmploc.lsp src/cmp/cmploc.lsp.orig -+++ src/cmp/cmploc.lsp -@@ -181,10 +181,30 @@ - (defun wt-temp (temp) - (wt "T" temp)) - -+(defun wt-fixnum (value vv) -+ (declare (ignore vv)) -+ (princ value *compiler-output1*) -+ ;; Specify explicit type suffix as a
Re: lang/ecl: backport a fix for building recent lang/sbcl
On Wed, Jun 28 2023, Sebastien Marie wrote: > Hi, > > The following diff backports a commit > (https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4) > > to fix a compiler bug. > > This bug is on the way to update lang/sbcl to more recent version (I tested > compiling sbcl-2.3.6 with ecl on amd64). > > While here, some smalls changes: > - V isn't present in PLIST, no need to add it to SUBST_VARS > - the licence is wrong: it is LGPLv2 or later > - use --enable-gmp=system instead of --with-system-gmp to unify the way > system libraries are configured > > Comments or OK ? looks good to me. timo
lang/ecl: backport a fix for building recent lang/sbcl
Hi, The following diff backports a commit (https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4) to fix a compiler bug. This bug is on the way to update lang/sbcl to more recent version (I tested compiling sbcl-2.3.6 with ecl on amd64). While here, some smalls changes: - V isn't present in PLIST, no need to add it to SUBST_VARS - the licence is wrong: it is LGPLv2 or later - use --enable-gmp=system instead of --with-system-gmp to unify the way system libraries are configured Comments or OK ? -- Sebastien Marie diff /home/semarie/repos/openbsd/ports commit - d5e6a0c0580dc3232cdef998743855ad7ea2aaa7 path + /home/semarie/repos/openbsd/ports blob - a2867ce45cd5dfb740d810a62664d2b1f2cc5c8a file + lang/ecl/Makefile --- lang/ecl/Makefile +++ lang/ecl/Makefile @@ -5,13 +5,14 @@ HOMEPAGE =https://common-lisp.net/project/ecl/ DISTNAME = ecl-$V SHARED_LIBS += ecl 8.0 +REVISION = 0 + HOMEPAGE = https://common-lisp.net/project/ecl/ MAINTAINER = Timo Myyra -SUBST_VARS = V EXTRACT_SUFX = .tgz -# GPLv2 or later +# LGPLv2 or later PERMIT_PACKAGE = Yes MASTER_SITES = ${HOMEPAGE}static/files/release/ @@ -27,7 +28,7 @@ CONFIGURE_ARGS += --enable-boehm=system \ CONFIGURE_ARGS += --enable-boehm=system \ --enable-libatomic=system \ - --with-system-gmp \ + --enable-gmp=system \ --with-gmp-prefix=${LOCALBASE} # etags gets picked up if it's installed, and dumps core while blob - /dev/null file + lang/ecl/patches/patch-src_cmp_cmpc-wt_lsp (mode 640) --- /dev/null +++ lang/ecl/patches/patch-src_cmp_cmpc-wt_lsp @@ -0,0 +1,25 @@ +backport https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4 + +Index: src/cmp/cmpc-wt.lsp +--- src/cmp/cmpc-wt.lsp.orig src/cmp/cmpc-wt.lsp +@@ -19,18 +19,7 @@ + (defun wt1 (form) + (cond ((not (floatp form)) + (typecase form +- (INTEGER +-(princ form *compiler-output1*) +-(princ +- (cond ((typep form (rep-type->lisp-type :int)) "") +- ((typep form (rep-type->lisp-type :unsigned-int)) "U") +- ((typep form (rep-type->lisp-type :long)) "L") +- ((typep form (rep-type->lisp-type :unsigned-long)) "UL") +- ((typep form (rep-type->lisp-type :long-long)) "LL") +- ((typep form (rep-type->lisp-type :unsigned-long-long)) "ULL") +- (t (baboon :format-control "wt1: The number ~A doesn't fit any integer type." form))) +- *compiler-output1*)) +- ((or STRING CHARACTER) ++ ((or INTEGER STRING CHARACTER) + (princ form *compiler-output1*)) + (VAR (wt-var form)) +(t (wt-loc form blob - /dev/null file + lang/ecl/patches/patch-src_cmp_cmploc_lsp (mode 640) --- /dev/null +++ lang/ecl/patches/patch-src_cmp_cmploc_lsp @@ -0,0 +1,36 @@ +backport https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4 + +Index: src/cmp/cmploc.lsp +--- src/cmp/cmploc.lsp.orig src/cmp/cmploc.lsp +@@ -181,10 +181,30 @@ + (defun wt-temp (temp) + (wt "T" temp)) + ++(defun wt-fixnum (value vv) ++ (declare (ignore vv)) ++ (princ value *compiler-output1*) ++ ;; Specify explicit type suffix as a workaround for MSVC. C99 ++ ;; standard compliant compilers don't need type suffixes and choose ++ ;; the correct type themselves. Note that we cannot savely use ++ ;; anything smaller than a long long here, because we might perform ++ ;; some other computation on the integer constant which could ++ ;; overflow if we use a smaller integer type (overflows in long long ++ ;; computations are taken care of by the compiler before we get to ++ ;; this point). ++ #+msvc (princ (cond ((typep value (rep-type->lisp-type :long-long)) "LL") ++ ((typep value (rep-type->lisp-type :unsigned-long-long)) "ULL") ++ (t (baboon :format-control ++ "wt-fixnum: The number ~A doesn't fit any integer type." ++ value))) ++*compiler-output1*)) ++ + (defun wt-number (value vv) ++ (declare (ignore vv)) + (wt value)) + + (defun wt-character (value vv) ++ (declare (ignore vv)) + ;; We do not use the '...' format because this creates objects of type + ;; 'char' which have sign problems + (wt value)) blob - /dev/null file + lang/ecl/patches/patch-src_cmp_cmptables_lsp (mode 640) --- /dev/null +++ lang/ecl/patches/patch-src_cmp_cmptables_lsp @@ -0,0 +1,14 @@ +backport https://gitlab.com/embeddable-common-lisp/ecl/-/commit/f3d4cf4b66ab6c3cd8629ab6d0c7f7c50d7fd8a4 + +Index: src/cmp/c
Re: [maintainer update] ecl-21.2.1
Timo Myyrä writes: > Here is updated diff which removes the symlink. Note that with this we > need to patch the ecl source as it checks library directory based on the > libecl.so location. Added simple patch to fix it by skipping the symlink > check. > > timo I've re-built the consumers (math/maxima, net/clic) and they're working. I've also played with quicklisp and tinmop (not packaged, unfortunately doesn't run with ecl but depends on a number of libraries from ql.) My issue with clic was that pkg_add left libecl-so.0.7 and click was linked against that but built with the newer headers. On a clean build with only the 0.8 library it builds, links and works correctly. committed, thanks!
Re: [maintainer update] ecl-21.2.1
Omar Polo [2022-01-21, 23:51 +0100]: > Timo Myyrä writes: > >> Timo Myyrä [2021-12-21, 13:08 +0200]: >> >> ping ping... >> >>> Ping >>> >>> On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote: >>>> Hi, >>>> >>>> Here's an bump to bring ecl to latest version. >>>> Lightly tested on amd64. >>>> >>>> Timo >>>> >>>> [...] > > Hello, > > I finally found some time to test the diff! :) > > The port builds fine, the diff looks good, the majority of the test are > also passing (18013 pass and 84 fail, the failings seems to be mostly > from math stuff.) > > There's only one issue I can see and even if it's not introduced by the > diff I think we should fix it: the symlink /usr/loclal/lib/libecl.so -> > libecl.so.0.8 should be removed. > > The situation with the dependencies is: > > - math/maxima: builds and the majority of the tests are passing, but I >don't use the software so I can't really comment > - math/wxMaxima: marked as broken, so doesn't count > - net/clic: I don't know if I'm doing something wrong but it's failing >at runtime: > > % clic > ;;; Loading #P"/usr/local/lib/ecl/asdf.fas" > clic:/usr/local/lib/libecl.so.8.0: /usr/local/lib/libecl.so.7.0 : WARNING: > symbol(cl_symbols) size mismatch, relink your program > > Condition of type: SEGMENTATION-VIOLATION > Detected access to an invalid or protected memory address. > Available restarts: > > 1. (CONTINUE) Ignore signal > > Top level in: #. >> > > which I don't understand, as I've rebuilt the package *after* installing > the ecl update which bumps the library. > > - sysutils/reed-alert: I don't use it and it doesn't have tests > > I'll look more deeply into this two issues (the symlink and net/clic) in > a couple of days, I just wanted to let you know I'm interested in seeing > ecl updated and that the email wasn't lost :) Here is updated diff which removes the symlink. Note that with this we need to patch the ecl source as it checks library directory based on the libecl.so location. Added simple patch to fix it by skipping the symlink check. timo diff 94718e017cf91b90185b8b806a67911b82f46d66 /usr/ports blob - 49c2de291af99891af2eab90692315ae9b00654f file + lang/ecl/Makefile --- lang/ecl/Makefile +++ lang/ecl/Makefile @@ -3,9 +3,9 @@ COMMENT = embeddable common-lisp CATEGORIES = lang -V =20.4.24 +V =21.2.1 DISTNAME = ecl-$V -SHARED_LIBS += ecl 7.0 +SHARED_LIBS += ecl 8.0 HOMEPAGE = https://common-lisp.net/project/ecl/ MAINTAINER = Timo Myyra @@ -46,9 +46,7 @@ LIB_DEPENDS +=devel/gmp \ devel/libffi TEST_DEPENDS = ${BASE_PKGPATH} +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \ + "TEST_IMAGE=${WRKDIST}/build/bin/ecl" -# XXX: Workaround for missing Copyright file -post-configure: - @cp ${WRKSRC}/{LICENSE,Copyright} - .include blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528 file + lang/ecl/distinfo --- lang/ecl/distinfo +++ lang/ecl/distinfo @@ -1,2 +1,2 @@ -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= -SIZE (ecl-20.4.24.tgz) = 7815444 +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA= +SIZE (ecl-21.2.1.tgz) = 7875088 blob - b44246b9b8d755df5784e6b4dd04570657feb031 file + lang/ecl/patches/patch-src_Makefile_in --- lang/ecl/patches/patch-src_Makefile_in +++ lang/ecl/patches/patch-src_Makefile_in @@ -2,11 +2,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.7 2020/08/24 21:38 Index: src/Makefile.in --- src/Makefile.in.orig +++ src/Makefile.in -@@ -212,30 +212,15 @@ install: - for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ +@@ -213,29 +213,13 @@ install: $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ done -+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir) - for i in build-stamp help.doc TAGS ; do \ -$(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ @@ -26,8 +24,8 @@ Index: src/Makefile.in - $(LN_S) @SONAME3@ @SONAME1@ && \ - $(LN_S) @SONAME3@ @SONAME@ ) \ - fi ++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) -+ cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) $(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir) for i in `cat modules`; do \ blob - 510d663817b8a3936ee24c14411001f61c030bbf file + /dev/null --- lang/ecl/patches/patch-src_c_package_d +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $ - -Wor
Re: [maintainer update] ecl-21.2.1
Timo Myyrä writes: > Timo Myyrä [2021-12-21, 13:08 +0200]: > > ping ping... > >> Ping >> >> On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote: >>> Hi, >>> >>> Here's an bump to bring ecl to latest version. >>> Lightly tested on amd64. >>> >>> Timo >>> >>> [...] Hello, I finally found some time to test the diff! :) The port builds fine, the diff looks good, the majority of the test are also passing (18013 pass and 84 fail, the failings seems to be mostly from math stuff.) There's only one issue I can see and even if it's not introduced by the diff I think we should fix it: the symlink /usr/loclal/lib/libecl.so -> libecl.so.0.8 should be removed. The situation with the dependencies is: - math/maxima: builds and the majority of the tests are passing, but I don't use the software so I can't really comment - math/wxMaxima: marked as broken, so doesn't count - net/clic: I don't know if I'm doing something wrong but it's failing at runtime: % clic ;;; Loading #P"/usr/local/lib/ecl/asdf.fas" clic:/usr/local/lib/libecl.so.8.0: /usr/local/lib/libecl.so.7.0 : WARNING: symbol(cl_symbols) size mismatch, relink your program Condition of type: SEGMENTATION-VIOLATION Detected access to an invalid or protected memory address. Available restarts: 1. (CONTINUE) Ignore signal Top level in: #. > which I don't understand, as I've rebuilt the package *after* installing the ecl update which bumps the library. - sysutils/reed-alert: I don't use it and it doesn't have tests I'll look more deeply into this two issues (the symlink and net/clic) in a couple of days, I just wanted to let you know I'm interested in seeing ecl updated and that the email wasn't lost :)
Re: [maintainer update] ecl-21.2.1
Timo Myyrä [2021-12-21, 13:08 +0200]: ping ping... > Ping > > On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote: >> Hi, >> >> Here's an bump to bring ecl to latest version. >> Lightly tested on amd64. >> >> Timo >> >> diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports >> blob - 49c2de291af99891af2eab90692315ae9b00654f >> file + lang/ecl/Makefile >> --- lang/ecl/Makefile >> +++ lang/ecl/Makefile >> @@ -3,9 +3,9 @@ >> COMMENT = embeddable common-lisp >> CATEGORIES =lang >> >> -V = 20.4.24 >> +V = 21.2.1 >> DISTNAME = ecl-$V >> -SHARED_LIBS += ecl 7.0 >> +SHARED_LIBS += ecl 8.0 >> >> HOMEPAGE = https://common-lisp.net/project/ecl/ >> MAINTAINER =Timo Myyra >> @@ -46,9 +46,7 @@ LIB_DEPENDS += devel/gmp \ >> devel/libffi >> >> TEST_DEPENDS = ${BASE_PKGPATH} >> +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \ >> +"TEST_IMAGE=${WRKDIST}/build/bin/ecl" >> >> -# XXX: Workaround for missing Copyright file >> -post-configure: >> -@cp ${WRKSRC}/{LICENSE,Copyright} >> - >> .include >> blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528 >> file + lang/ecl/distinfo >> --- lang/ecl/distinfo >> +++ lang/ecl/distinfo >> @@ -1,2 +1,2 @@ >> -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= >> -SIZE (ecl-20.4.24.tgz) = 7815444 >> +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA= >> +SIZE (ecl-21.2.1.tgz) = 7875088 >> blob - b44246b9b8d755df5784e6b4dd04570657feb031 >> file + lang/ecl/patches/patch-src_Makefile_in >> --- lang/ecl/patches/patch-src_Makefile_in >> +++ lang/ecl/patches/patch-src_Makefile_in >> @@ -6,7 +6,6 @@ Index: src/Makefile.in >> for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ >>$(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ >> done >> -+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) >> $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir) >> - for i in build-stamp help.doc TAGS ; do \ >> - $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ >> @@ -26,6 +25,7 @@ Index: src/Makefile.in >> - $(LN_S) @SONAME3@ @SONAME1@ && \ >> - $(LN_S) @SONAME3@ @SONAME@ ) \ >> - fi >> ++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) >> + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) >> + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so >> $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) >> blob - 510d663817b8a3936ee24c14411001f61c030bbf >> file + /dev/null >> --- lang/ecl/patches/patch-src_c_package_d >> +++ /dev/null >> @@ -1,26 +0,0 @@ >> -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $ >> - >> -Work around a SIGSEGV on 64-bit big-endian platforms >> -(mips64, powerpc64, sparc64), from Daniel Kochmaski, >> -https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381 >> - >> -Index: src/c/package.d >> src/c/package.d.orig >> -+++ src/c/package.d >> -@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name) >> - return name; >> - name = cl_string(name); >> - >> -- p = ecl_symbol_value(@'*package*'); >> -- if (ECL_PACKAGEP(p)) { >> --p = ecl_assoc(name, p->pack.local_nicknames); >> --if (!Null(p)) return ECL_CONS_CDR(p); >> -+ if (ecl_option_values[ECL_OPT_BOOTED]) { >> -+p = ecl_symbol_value(@'*package*'); >> -+if (ECL_PACKAGEP(p)) { >> -+ p = ecl_assoc(name, p->pack.local_nicknames); >> -+ if (!Null(p)) return ECL_CONS_CDR(p); >> -+} >> - } >> - >> - l = cl_core.packages; >> blob - 1f720b8258ab12e59b9c01b247cf29641de99555 >> file + lang/ecl/patches/patch-src_configure >> --- lang/ecl/patches/patch-src_configure >> +++ lang/ecl/patches/patch-src_configure >> @@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0 >> Index: src/configure >> --- src/configure.orig >> +++ src/configure >> -@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" >> +@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" >> BUNDLE_LDFLAGS="-shared ${LDFLAGS}" >> ECL_LDRPATH="-Wl,--rpath,~A" >> clibs="-lpthread ${clibs}" >> @@ -11,7 +11,7 @@ Index: src/configure >> SONAME_LDFLAGS="-Wl,-soname,SONAME" >> ;; >> solaris*) >> -@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then >> +@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then >> >> $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h >> >> blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40 >> file + lang/ecl/pkg/PLIST >> --- lang/ecl/pkg/PLIST >> +++ lang/ecl/pkg/PLIST >> @@ -29,7 +29,6 @@ include/ecl/object.h >> include/ecl/page.h >> include/ecl/stack-resize.h >> include/ecl/stacks.h >> -info/ecl.info.gz >> lib/ecl/ >> lib/ecl/COPYING >> lib/ecl/LICENSE
Re: [maintainer update] ecl-21.2.1
Ping On Sat, Dec 11, 2021, at 18:34, Timo Myyrä wrote: > Hi, > > Here's an bump to bring ecl to latest version. > Lightly tested on amd64. > > Timo > > diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports > blob - 49c2de291af99891af2eab90692315ae9b00654f > file + lang/ecl/Makefile > --- lang/ecl/Makefile > +++ lang/ecl/Makefile > @@ -3,9 +3,9 @@ > COMMENT =embeddable common-lisp > CATEGORIES = lang > > -V = 20.4.24 > +V = 21.2.1 > DISTNAME = ecl-$V > -SHARED_LIBS += ecl 7.0 > +SHARED_LIBS += ecl 8.0 > > HOMEPAGE = https://common-lisp.net/project/ecl/ > MAINTAINER = Timo Myyra > @@ -46,9 +46,7 @@ LIB_DEPENDS += devel/gmp \ > devel/libffi > > TEST_DEPENDS = ${BASE_PKGPATH} > +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \ > + "TEST_IMAGE=${WRKDIST}/build/bin/ecl" > > -# XXX: Workaround for missing Copyright file > -post-configure: > - @cp ${WRKSRC}/{LICENSE,Copyright} > - > .include > blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528 > file + lang/ecl/distinfo > --- lang/ecl/distinfo > +++ lang/ecl/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= > -SIZE (ecl-20.4.24.tgz) = 7815444 > +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA= > +SIZE (ecl-21.2.1.tgz) = 7875088 > blob - b44246b9b8d755df5784e6b4dd04570657feb031 > file + lang/ecl/patches/patch-src_Makefile_in > --- lang/ecl/patches/patch-src_Makefile_in > +++ lang/ecl/patches/patch-src_Makefile_in > @@ -6,7 +6,6 @@ Index: src/Makefile.in > for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ > $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ > done > -+$(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) > $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir) > -for i in build-stamp help.doc TAGS ; do \ > - $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ > @@ -26,6 +25,7 @@ Index: src/Makefile.in > -$(LN_S) @SONAME3@ @SONAME1@ && \ > -$(LN_S) @SONAME3@ @SONAME@ ) \ > -fi > ++$(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) > +${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) > +cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so > $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) > blob - 510d663817b8a3936ee24c14411001f61c030bbf > file + /dev/null > --- lang/ecl/patches/patch-src_c_package_d > +++ /dev/null > @@ -1,26 +0,0 @@ > -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $ > - > -Work around a SIGSEGV on 64-bit big-endian platforms > -(mips64, powerpc64, sparc64), from Daniel Kochmaski, > -https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381 > - > -Index: src/c/package.d > src/c/package.d.orig > -+++ src/c/package.d > -@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name) > - return name; > - name = cl_string(name); > - > -- p = ecl_symbol_value(@'*package*'); > -- if (ECL_PACKAGEP(p)) { > --p = ecl_assoc(name, p->pack.local_nicknames); > --if (!Null(p)) return ECL_CONS_CDR(p); > -+ if (ecl_option_values[ECL_OPT_BOOTED]) { > -+p = ecl_symbol_value(@'*package*'); > -+if (ECL_PACKAGEP(p)) { > -+ p = ecl_assoc(name, p->pack.local_nicknames); > -+ if (!Null(p)) return ECL_CONS_CDR(p); > -+} > - } > - > - l = cl_core.packages; > blob - 1f720b8258ab12e59b9c01b247cf29641de99555 > file + lang/ecl/patches/patch-src_configure > --- lang/ecl/patches/patch-src_configure > +++ lang/ecl/patches/patch-src_configure > @@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0 > Index: src/configure > --- src/configure.orig > +++ src/configure > -@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" > +@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" > BUNDLE_LDFLAGS="-shared ${LDFLAGS}" > ECL_LDRPATH="-Wl,--rpath,~A" > clibs="-lpthread ${clibs}" > @@ -11,7 +11,7 @@ Index: src/configure > SONAME_LDFLAGS="-Wl,-soname,SONAME" > ;; > solaris*) > -@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then > +@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then > > $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h > > blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40 > file + lang/ecl/pkg/PLIST > --- lang/ecl/pkg/PLIST > +++ lang/ecl/pkg/PLIST > @@ -29,7 +29,6 @@ include/ecl/object.h > include/ecl/page.h > include/ecl/stack-resize.h > include/ecl/stacks.h > -info/ecl.info.gz > lib/ecl/ > lib/ecl/COPYING > lib/ecl/LICENSE
[maintainer update] ecl-21.2.1
Hi, Here's an bump to bring ecl to latest version. Lightly tested on amd64. Timo diff 31bccecebaefd3b23c4e4dac76105b5dd0ae1159 /usr/ports blob - 49c2de291af99891af2eab90692315ae9b00654f file + lang/ecl/Makefile --- lang/ecl/Makefile +++ lang/ecl/Makefile @@ -3,9 +3,9 @@ COMMENT = embeddable common-lisp CATEGORIES = lang -V =20.4.24 +V =21.2.1 DISTNAME = ecl-$V -SHARED_LIBS += ecl 7.0 +SHARED_LIBS += ecl 8.0 HOMEPAGE = https://common-lisp.net/project/ecl/ MAINTAINER = Timo Myyra @@ -46,9 +46,7 @@ LIB_DEPENDS +=devel/gmp \ devel/libffi TEST_DEPENDS = ${BASE_PKGPATH} +TEST_ENV = "ECL=${WRKDIST}/build/bin/ecl" \ + "TEST_IMAGE=${WRKDIST}/build/bin/ecl" -# XXX: Workaround for missing Copyright file -post-configure: - @cp ${WRKSRC}/{LICENSE,Copyright} - .include blob - 5c3377469374e1eefeb7900f2d30b5660b4c9528 file + lang/ecl/distinfo --- lang/ecl/distinfo +++ lang/ecl/distinfo @@ -1,2 +1,2 @@ -SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= -SIZE (ecl-20.4.24.tgz) = 7815444 +SHA256 (ecl-21.2.1.tgz) = sVp13PhLj2LmhyDMqxOT+WEcB4/NOv3WOaEIbK0BCQA= +SIZE (ecl-21.2.1.tgz) = 7875088 blob - b44246b9b8d755df5784e6b4dd04570657feb031 file + lang/ecl/patches/patch-src_Makefile_in --- lang/ecl/patches/patch-src_Makefile_in +++ lang/ecl/patches/patch-src_Makefile_in @@ -6,7 +6,6 @@ Index: src/Makefile.in for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ done -+ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) $(INSTALL_SCRIPT) bin/ecl-config $(DESTDIR)$(bindir) - for i in build-stamp help.doc TAGS ; do \ -$(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ @@ -26,6 +25,7 @@ Index: src/Makefile.in - $(LN_S) @SONAME3@ @SONAME1@ && \ - $(LN_S) @SONAME3@ @SONAME@ ) \ - fi ++ $(INSTALL_DATA) help.doc $(DESTDIR)$(ecldir) + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) blob - 510d663817b8a3936ee24c14411001f61c030bbf file + /dev/null --- lang/ecl/patches/patch-src_c_package_d +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_c_package_d,v 1.1 2020/08/24 21:38:06 gkoehler Exp $ - -Work around a SIGSEGV on 64-bit big-endian platforms -(mips64, powerpc64, sparc64), from Daniel Kochmaski, -https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381 - -Index: src/c/package.d src/c/package.d.orig -+++ src/c/package.d -@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name) - return name; - name = cl_string(name); - -- p = ecl_symbol_value(@'*package*'); -- if (ECL_PACKAGEP(p)) { --p = ecl_assoc(name, p->pack.local_nicknames); --if (!Null(p)) return ECL_CONS_CDR(p); -+ if (ecl_option_values[ECL_OPT_BOOTED]) { -+p = ecl_symbol_value(@'*package*'); -+if (ECL_PACKAGEP(p)) { -+ p = ecl_assoc(name, p->pack.local_nicknames); -+ if (!Null(p)) return ECL_CONS_CDR(p); -+} - } - - l = cl_core.packages; blob - 1f720b8258ab12e59b9c01b247cf29641de99555 file + lang/ecl/patches/patch-src_configure --- lang/ecl/patches/patch-src_configure +++ lang/ecl/patches/patch-src_configure @@ -2,7 +2,7 @@ $OpenBSD: patch-src_configure,v 1.9 2020/08/24 21:38:0 Index: src/configure --- src/configure.orig +++ src/configure -@@ -5050,7 +5050,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" +@@ -5240,7 +5240,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" BUNDLE_LDFLAGS="-shared ${LDFLAGS}" ECL_LDRPATH="-Wl,--rpath,~A" clibs="-lpthread ${clibs}" @@ -11,7 +11,7 @@ Index: src/configure SONAME_LDFLAGS="-Wl,-soname,SONAME" ;; solaris*) -@@ -9682,7 +9682,7 @@ if test ${enable_shared} = "yes"; then +@@ -9910,7 +9910,7 @@ if test ${enable_shared} = "yes"; then $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h blob - aaa872a968b99a07f318f3b31e3a8bf0ebbfea40 file + lang/ecl/pkg/PLIST --- lang/ecl/pkg/PLIST +++ lang/ecl/pkg/PLIST @@ -29,7 +29,6 @@ include/ecl/object.h include/ecl/page.h include/ecl/stack-resize.h include/ecl/stacks.h -info/ecl.info.gz lib/ecl/ lib/ecl/COPYING lib/ecl/LICENSE
Re: Update lang/ecl to 20.4.24
On Fri, 31 Jul 2020 19:07:07 -0700 Josh Elsasser wrote: > I applied the diff directly from gitlab and was able to build ecl on > sparc64 and mips64. When I tried to run the tests, sparc64 hung (not > spinning) on test CMP.0009.FINALIZATION and mips64 segfaulted almost > immediately: > > Running test ATOMIC-INCF/DECF > ;;; > ;;; Detected access to protected memory, also known as 'bus or segmentation > fault'. > ;;; Jumping to the outermost toplevel prompt I rechecked powerpc64 (and amd64, macppc) and can't reproduce the hang or segfault. In my opinion, we should package ecl-20.4.24 for mips64 and sparc64, even if we can't fix these problems. I resent my gc diff in "devel/boehm-gc: use mmap; fix powerpc64, sparc64" to ask for OK. Who will commit the ecl update? I want the update with these changes: 1. remove the BROKEN-mips64 2. add patch-src_c_package_d so I can run ecl on powerpc64 This is the patch-src_c_package_d; I have trimmed it to remove the part that only reformatted a comment: Index: patches/patch-src_c_package_d === RCS file: patches/patch-src_c_package_d diff -N patches/patch-src_c_package_d --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_c_package_d 3 Aug 2020 16:11:28 - @@ -0,0 +1,26 @@ +$OpenBSD$ + +Work around a SIGSEGV on 64-bit big-endian platforms +(mips64, powerpc64, sparc64), from Daniel Kochmaski, +https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381 + +Index: src/c/package.d +--- src/c/package.d.orig src/c/package.d +@@ -327,10 +327,12 @@ ecl_find_package_nolock(cl_object name) + return name; + name = cl_string(name); + +- p = ecl_symbol_value(@'*package*'); +- if (ECL_PACKAGEP(p)) { +-p = ecl_assoc(name, p->pack.local_nicknames); +-if (!Null(p)) return ECL_CONS_CDR(p); ++ if (ecl_option_values[ECL_OPT_BOOTED]) { ++p = ecl_symbol_value(@'*package*'); ++if (ECL_PACKAGEP(p)) { ++ p = ecl_assoc(name, p->pack.local_nicknames); ++ if (!Null(p)) return ECL_CONS_CDR(p); ++} + } + + l = cl_core.packages;
Re: Update lang/ecl to 20.4.24
On Thu, Jul 30, 2020 at 02:33:45PM -0400, George Koehler wrote: > On Thu, 30 Jul 2020 08:32:25 -0700 > Josh Elsasser wrote: > > > With George's patch, it segfaults in ecl_min as he predicted, > > similarly to mips64: > > ... > > Got signal before environment was installed on our thread > > > > Daniel Kochmański put up a diff for ecl_find_package_nolock() that > "is not a proper fix", but gets around the segfault: > https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381 > > Here's the diff as a ports/lang/ecl patch. With this diff, and the > boehm-gc diff from my last mail, I can build and run ecl on my > powerpc64. "make test" says, > > Did 245 tests (0 crashed), 17999 checks. > >Pass: 17908 (99%) > >Fail: 91 ( 1%) > I applied the diff directly from gitlab and was able to build ecl on sparc64 and mips64. When I tried to run the tests, sparc64 hung (not spinning) on test CMP.0009.FINALIZATION and mips64 segfaulted almost immediately: Running test ATOMIC-INCF/DECF ;;; ;;; Detected access to protected memory, also known as 'bus or segmentation fault'. ;;; Jumping to the outermost toplevel prompt
Re: Update lang/ecl to 20.4.24
On Thu, 30 Jul 2020 08:32:25 -0700 Josh Elsasser wrote: > With George's patch, it segfaults in ecl_min as he predicted, > similarly to mips64: > ... > Got signal before environment was installed on our thread > Daniel Kochmański put up a diff for ecl_find_package_nolock() that "is not a proper fix", but gets around the segfault: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604#note_388147381 Here's the diff as a ports/lang/ecl patch. With this diff, and the boehm-gc diff from my last mail, I can build and run ecl on my powerpc64. "make test" says, Did 245 tests (0 crashed), 17999 checks. Pass: 17908 (99%) Fail: 91 ( 1%) --- /dev/null Thu Jul 30 14:17:54 2020 +++ patches/patch-src_c_package_d Thu Jul 30 13:44:33 2020 @@ -0,0 +1,45 @@ +$OpenBSD$ + +Index: src/c/package.d +--- src/c/package.d.orig src/c/package.d +@@ -308,15 +308,14 @@ ecl_rename_package(cl_object x, cl_object name, cl_obj + } + + /* +- ecl_find_package_nolock(n) seaches for a package with name n, where n is +- a valid string designator, or simply outputs n if it is a +- package. ++ ecl_find_package_nolock(n) seaches for a package with name n, where n is a ++ valid string designator, or simply outputs n if it is a package. + +- This is not a locking routine and someone may replace the list of +- packages while we are scanning it. Nevertheless, the list IS NOT +- be destructively modified, which means that we are on the safe side. +- Routines which need to ensure that the package list remains constant +- should enforce a global lock with PACKAGE_OP_LOCK(). ++ This is not a locking routine and someone may replace the list of packages ++ while we are scanning it. Nevertheless, the list IS NOT destructively ++ modified, which means that we are on the safe side. Routines which need to ++ ensure that the package list remains constant should enforce a global lock ++ with PACKAGE_OP_LOCK(). + */ + cl_object + ecl_find_package_nolock(cl_object name) +@@ -327,10 +326,12 @@ ecl_find_package_nolock(cl_object name) + return name; + name = cl_string(name); + +- p = ecl_symbol_value(@'*package*'); +- if (ECL_PACKAGEP(p)) { +-p = ecl_assoc(name, p->pack.local_nicknames); +-if (!Null(p)) return ECL_CONS_CDR(p); ++ if (ecl_option_values[ECL_OPT_BOOTED]) { ++p = ecl_symbol_value(@'*package*'); ++if (ECL_PACKAGEP(p)) { ++ p = ecl_assoc(name, p->pack.local_nicknames); ++ if (!Null(p)) return ECL_CONS_CDR(p); ++} + } + + l = cl_core.packages;
Re: Update lang/ecl to 20.4.24
On Thu, Jul 30, 2020 at 08:32:25AM -0700, Josh Elsasser wrote: > It built for me, did you install the new libatomic_ops package too? I > notice that "make install" only installed the boehm-gc package. I... did not. I'm not familiar with boehm-gc so didn't realize that was needed. I'll give it a try again soon. Right now my test machine is churning on something else. --Kurt > With George's patch, it segfaults in ecl_min as he predicted, > similarly to mips64: > Building ecl_min... > > libeclmin.a(unixfsys.o): In function `ecl_backup_open': > unixfsys.o.c:(.text+0x4a8): warning: strcpy() is almost always misused, > please use strlcpy() > /usr/local/lib/libgmp.so.11.0: warning: vsprintf() is often misused, please > use vsnprintf() > libeclmin.a(num_rand.o): In function `init_random_state': > > num_rand.o.c:(.text+0x2ac): warning: rand() may return deterministic values, > is that what you want? > > > Internal or unrecoverable error in: > > Got signal before environment was installed on our thread > > Abort trap (core dumped) > gmake[1]: *** [Makefile:99: bin/ecl] Error 134 > > > (gdb) bt > #0 *_libc_abort () at /usr/src/lib/libc/stdlib/abort.c:57 > #1 0x006af5d32f4c in ecl_internal_error () > #2 0x006af5d64194 in sigsegv_handler () > #3 > #4 0x006af5d05154 in ecl_find_package_nolock () > #5 0x006af5d054c0 in ecl_make_package () > #6 0x006af5d022bc in cl_boot () > #7 0x006af5d00f6c in main ()
Re: Update lang/ecl to 20.4.24
On Wed, Jul 29, 2020 at 11:52:25PM -0400, Kurt Mosiejczuk wrote: > On Wed, Jul 29, 2020 at 11:05:31PM -0400, George Koehler wrote: > > On Wed, 29 Jul 2020 01:25:00 -0400 > > Kurt Mosiejczuk wrote: > > > > I gave building it a try, it died early on with: > > > > /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:39:4: > > > error: #er > > > ror "ECL needs AO_fetch_compare_and_swap or an equivalent" > > > # error "ECL needs AO_fetch_compare_and_swap or an equivalent" > > > Thank you for the speedy test. libatomic_ops in devel/boehm-gc is > > missing AO_fetch_compare_and_swap for sparc. It's still missing > > upstream: > > > https://github.com/ivmai/libatomic_ops/blob/master/src/atomic_ops/sysdeps/gcc/sparc.h#L64 > > > In this diff to devel/boehm-gc, I have tried to provide the missing > > function (by copying AO_compare_and_swap_full, guessing, and referring > > to SPARCV9.pdf, A.9 Compare and Swap, page 129), but I don't know > > whether it compiles. Even if it compiles, if sparc64 will have the > > ecl_symbol_value bug, we won't know if it works. I left my other > > local changes (mmap and powerpc64) in the diff. > > > I describe the 64-bit big-endian ecl_symbol_value bug at > > https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604 > > Unfortunately, even with boehm-gc compiled with this, ecl fails to > build with the same message. It built for me, did you install the new libatomic_ops package too? I notice that "make install" only installed the boehm-gc package. With George's patch, it segfaults in ecl_min as he predicted, similarly to mips64: Building ecl_min... libeclmin.a(unixfsys.o): In function `ecl_backup_open': unixfsys.o.c:(.text+0x4a8): warning: strcpy() is almost always misused, please use strlcpy() /usr/local/lib/libgmp.so.11.0: warning: vsprintf() is often misused, please use vsnprintf() libeclmin.a(num_rand.o): In function `init_random_state': num_rand.o.c:(.text+0x2ac): warning: rand() may return deterministic values, is that what you want? Internal or unrecoverable error in: Got signal before environment was installed on our thread Abort trap (core dumped) gmake[1]: *** [Makefile:99: bin/ecl] Error 134 (gdb) bt #0 *_libc_abort () at /usr/src/lib/libc/stdlib/abort.c:57 #1 0x006af5d32f4c in ecl_internal_error () #2 0x006af5d64194 in sigsegv_handler () #3 #4 0x006af5d05154 in ecl_find_package_nolock () #5 0x006af5d054c0 in ecl_make_package () #6 0x006af5d022bc in cl_boot () #7 0x006af5d00f6c in main ()
Re: Update lang/ecl to 20.4.24
On Wed, Jul 29, 2020 at 11:05:31PM -0400, George Koehler wrote: > On Wed, 29 Jul 2020 01:25:00 -0400 > Kurt Mosiejczuk wrote: > > I gave building it a try, it died early on with: > > /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:39:4: > > error: #er > > ror "ECL needs AO_fetch_compare_and_swap or an equivalent" > > # error "ECL needs AO_fetch_compare_and_swap or an equivalent" > Thank you for the speedy test. libatomic_ops in devel/boehm-gc is > missing AO_fetch_compare_and_swap for sparc. It's still missing > upstream: > https://github.com/ivmai/libatomic_ops/blob/master/src/atomic_ops/sysdeps/gcc/sparc.h#L64 > In this diff to devel/boehm-gc, I have tried to provide the missing > function (by copying AO_compare_and_swap_full, guessing, and referring > to SPARCV9.pdf, A.9 Compare and Swap, page 129), but I don't know > whether it compiles. Even if it compiles, if sparc64 will have the > ecl_symbol_value bug, we won't know if it works. I left my other > local changes (mmap and powerpc64) in the diff. > I describe the 64-bit big-endian ecl_symbol_value bug at > https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604 Unfortunately, even with boehm-gc compiled with this, ecl fails to build with the same message. --Kurt > Index: Makefile > === > RCS file: /cvs/ports/devel/boehm-gc/Makefile,v > retrieving revision 1.74 > diff -u -p -r1.74 Makefile > --- Makefile 4 Apr 2020 20:59:41 - 1.74 > +++ Makefile 30 Jul 2020 02:37:28 - > @@ -12,7 +12,7 @@ DISTNAME= gc-${VERSION} > > PKGNAME-atomic= libatomic_ops-${LIBAO_VERSION} > PKGNAME-main=boehm-gc-${VERSION} > -REVISION=5 > +REVISION=6 > > DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ > libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX} > Index: patches/patch-include_private_gcconfig_h > === > RCS file: /cvs/ports/devel/boehm-gc/patches/patch-include_private_gcconfig_h,v > retrieving revision 1.22 > diff -u -p -r1.22 patch-include_private_gcconfig_h > --- patches/patch-include_private_gcconfig_h 15 Apr 2017 14:02:46 - > 1.22 > +++ patches/patch-include_private_gcconfig_h 30 Jul 2020 02:37:28 - > @@ -1,12 +1,25 @@ > $OpenBSD: patch-include_private_gcconfig_h,v 1.22 2017/04/15 14:02:46 naddy > Exp $ > > +- use mmap, not sbrk, on OpenBSD > - All OpenBSD mips platforms are 64-bit, so correct the wordsize and > alignment > - use __data_start instead of _fdata on OpenBSD/mips64 > -- add support for OpenBSD/aarch64 > +- add support for OpenBSD/aarch64 and powerpc64 > > include/private/gcconfig.h.orig Tue Aug 2 21:36:14 2016 > -+++ include/private/gcconfig.h Fri Apr 14 17:44:40 2017 > -@@ -102,7 +102,8 @@ > +Index: include/private/gcconfig.h > +--- include/private/gcconfig.h.orig > include/private/gcconfig.h > +@@ -76,6 +76,10 @@ > + /* And one for OpenBSD: */ > + # if defined(__OpenBSD__) > + #define OPENBSD > ++#ifndef USE_MMAP > ++# define USE_MMAP > ++#endif > ++#define USE_MMAP_ANON > + # endif > + > + /* And one for FreeBSD: */ > +@@ -102,7 +106,8 @@ > # endif > # if defined(__aarch64__) > #define AARCH64 > @@ -16,7 +29,7 @@ $OpenBSD: patch-include_private_gcconfig > # define NOSYS > # define mach_type_known > #endif > -@@ -137,6 +138,10 @@ > +@@ -137,6 +142,10 @@ > #define ARM32 > #define mach_type_known > # endif > @@ -27,7 +40,21 @@ $OpenBSD: patch-include_private_gcconfig > # if defined(OPENBSD) && defined(__sh__) > #define SH > #define mach_type_known > -@@ -1712,14 +1717,15 @@ > +@@ -962,7 +971,12 @@ > + # endif > + # ifdef OPENBSD > + # define OS_TYPE "OPENBSD" > +-# define ALIGNMENT 4 > ++# if defined(__powerpc64__) > ++# define ALIGNMENT 8 > ++# define CPP_WORDSZ 64 > ++# else > ++# define ALIGNMENT 4 > ++# endif > + # ifndef GC_OPENBSD_THREADS > + # include > + # include > +@@ -1712,14 +1726,15 @@ > # endif > # ifdef OPENBSD > #define OS_TYPE "OPENBSD" > @@ -46,7 +73,7 @@ $OpenBSD: patch-include_private_gcconfig >extern int _end[]; > #define DATAEND ((ptr_t)(&_end)) > #define DYNAMIC_LOADING > -@@ -2165,6 +2171,19 @@ > +@@ -2165,6 +2180,19 @@ > extern char etext[]; > # define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext) > # define DATASTART_USES_BSDGETDATASTART > Index: patches/patch-libatom
Re: Update lang/ecl to 20.4.24
On Wed, 29 Jul 2020 01:25:00 -0400 Kurt Mosiejczuk wrote: > I gave building it a try, it died early on with: > > /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:39:4: error: > #er > ror "ECL needs AO_fetch_compare_and_swap or an equivalent" > # error "ECL needs AO_fetch_compare_and_swap or an equivalent" Thank you for the speedy test. libatomic_ops in devel/boehm-gc is missing AO_fetch_compare_and_swap for sparc. It's still missing upstream: https://github.com/ivmai/libatomic_ops/blob/master/src/atomic_ops/sysdeps/gcc/sparc.h#L64 In this diff to devel/boehm-gc, I have tried to provide the missing function (by copying AO_compare_and_swap_full, guessing, and referring to SPARCV9.pdf, A.9 Compare and Swap, page 129), but I don't know whether it compiles. Even if it compiles, if sparc64 will have the ecl_symbol_value bug, we won't know if it works. I left my other local changes (mmap and powerpc64) in the diff. I describe the 64-bit big-endian ecl_symbol_value bug at https://gitlab.com/embeddable-common-lisp/ecl/-/issues/604 Index: Makefile === RCS file: /cvs/ports/devel/boehm-gc/Makefile,v retrieving revision 1.74 diff -u -p -r1.74 Makefile --- Makefile4 Apr 2020 20:59:41 - 1.74 +++ Makefile30 Jul 2020 02:37:28 - @@ -12,7 +12,7 @@ DISTNAME= gc-${VERSION} PKGNAME-atomic=libatomic_ops-${LIBAO_VERSION} PKGNAME-main= boehm-gc-${VERSION} -REVISION= 5 +REVISION= 6 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ libatomic_ops-${LIBAO_VERSION}${EXTRACT_SUFX} Index: patches/patch-include_private_gcconfig_h === RCS file: /cvs/ports/devel/boehm-gc/patches/patch-include_private_gcconfig_h,v retrieving revision 1.22 diff -u -p -r1.22 patch-include_private_gcconfig_h --- patches/patch-include_private_gcconfig_h15 Apr 2017 14:02:46 - 1.22 +++ patches/patch-include_private_gcconfig_h30 Jul 2020 02:37:28 - @@ -1,12 +1,25 @@ $OpenBSD: patch-include_private_gcconfig_h,v 1.22 2017/04/15 14:02:46 naddy Exp $ +- use mmap, not sbrk, on OpenBSD - All OpenBSD mips platforms are 64-bit, so correct the wordsize and alignment - use __data_start instead of _fdata on OpenBSD/mips64 -- add support for OpenBSD/aarch64 +- add support for OpenBSD/aarch64 and powerpc64 include/private/gcconfig.h.origTue Aug 2 21:36:14 2016 -+++ include/private/gcconfig.h Fri Apr 14 17:44:40 2017 -@@ -102,7 +102,8 @@ +Index: include/private/gcconfig.h +--- include/private/gcconfig.h.orig include/private/gcconfig.h +@@ -76,6 +76,10 @@ + /* And one for OpenBSD: */ + # if defined(__OpenBSD__) + #define OPENBSD ++#ifndef USE_MMAP ++# define USE_MMAP ++#endif ++#define USE_MMAP_ANON + # endif + + /* And one for FreeBSD: */ +@@ -102,7 +106,8 @@ # endif # if defined(__aarch64__) #define AARCH64 @@ -16,7 +29,7 @@ $OpenBSD: patch-include_private_gcconfig # define NOSYS # define mach_type_known #endif -@@ -137,6 +138,10 @@ +@@ -137,6 +142,10 @@ #define ARM32 #define mach_type_known # endif @@ -27,7 +40,21 @@ $OpenBSD: patch-include_private_gcconfig # if defined(OPENBSD) && defined(__sh__) #define SH #define mach_type_known -@@ -1712,14 +1717,15 @@ +@@ -962,7 +971,12 @@ + # endif + # ifdef OPENBSD + # define OS_TYPE "OPENBSD" +-# define ALIGNMENT 4 ++# if defined(__powerpc64__) ++# define ALIGNMENT 8 ++# define CPP_WORDSZ 64 ++# else ++# define ALIGNMENT 4 ++# endif + # ifndef GC_OPENBSD_THREADS + # include + # include +@@ -1712,14 +1726,15 @@ # endif # ifdef OPENBSD #define OS_TYPE "OPENBSD" @@ -46,7 +73,7 @@ $OpenBSD: patch-include_private_gcconfig extern int _end[]; #define DATAEND ((ptr_t)(&_end)) #define DYNAMIC_LOADING -@@ -2165,6 +2171,19 @@ +@@ -2165,6 +2180,19 @@ extern char etext[]; # define DATASTART GC_FreeBSDGetDataStart(0x1000, (ptr_t)etext) # define DATASTART_USES_BSDGETDATASTART Index: patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h === RCS file: /cvs/ports/devel/boehm-gc/patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h,v retrieving revision 1.3 diff -u -p -r1.3 patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h --- patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h 4 Apr 2020 20:59:41 - 1.3 +++ patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h 30 Jul 2020 02:37:28 - @@ -2,6 +2,8 @@ $OpenBSD: patch-libatomic_ops_src_atomic Use the same type for input and output inline asm operands. +Provide AO_fetch_compare_and_swap, needed by lang/ecl 20.4.24. + Index: libatomic_ops/src/atomic
Re: Update lang/ecl to 20.4.24
On Wed, Jul 29, 2020 at 01:25:00AM -0400, Kurt Mosiejczuk wrote: > On Tue, Jul 28, 2020 at 11:59:03PM -0400, George Koehler wrote: > > > This update might break sparc64. I don't have sparc64, but found a > > bug in 20.4.24 on powerpc64 that might affect other 64-bit big-endian > > arch (mips64 and sparc64). It's BROKEN-mips64, but the sparc64 snap > > has packages of clic and maxima with ecl-16.1.3.p3. > > > The ecl update has been stuck because it breaks net/clic (as Solene > > said). In other ways, the update looks good to me. > > > ecl-20.4.24 works on macppc, has the same number of failures as amd64: > > > Did 245 tests (0 crashed), 17999 checks. > >Pass: 17912 (100%) > >Fail: 87 ( 0%) > > > reed-alert seems to work on macppc. > > > I didn't try maxima on macppc. For maxima on amd64, I replicated the > > test results that Timo posted, and I can run xmaxima. > > > For the bug in 20.4.24 that broke my powerpc64, I need to write a bug > > report for upstream. ecl_min calls ecl_symbol_value() before > > init_all_symbols(); reads p = q->data.value too early; gets p == 2 on > > most arch, p == 0x2 on 64-bit big-endian; but if (p & 3) == 0 > > then ecl_min fails with SIGSEGV. (powerpc64 also needs a diff for > > lang/boehm-gc that I intend to share later.)--George > > I gave building it a try, it died early on with: > > /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:39:4: error: > #er > ror "ECL needs AO_fetch_compare_and_swap or an equivalent" > # error "ECL needs AO_fetch_compare_and_swap or an equivalent" My mips64 is still updating, but I see the same on sparc64: ===> Building for ecl-20.4.24 cd build; gmake gmake[1]: Entering directory '/usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build' Building libeclmin.a... gmake[2]: Entering directory '/usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/c' Makefile:90: warning: ignoring prerequisites on suffix rule definition Makefile:90: warning: ignoring prerequisites on suffix rule definition Makefile:90: warning: ignoring prerequisites on suffix rule definition Makefile:90: warning: ignoring prerequisites on suffix rule definition Makefile:87: warning: ignoring prerequisites on suffix rule definition Makefile:85: warning: ignoring prerequisites on suffix rule definition Makefile:85: warning: ignoring prerequisites on suffix rule definition Makefile:87: warning: ignoring prerequisites on suffix rule definition dpp: /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/src/c/main.d -> main.o.c In file included from /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/stacks.h:23, from /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl.h:89, from /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/src/c/main.d:17: /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:39:4: error: #error "ECL needs AO_fetch_compare_and_swap or an equivalent" # error "ECL needs AO_fetch_compare_and_swap or an equivalent" ^ /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h: In function 'ecl_compare_and_swap': /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:45:21: warning: implicit declaration of function 'AO_fetch_compare_and_swap'; did you mean 'AO_HAVE_compare_and_swap'? [-Wimplicit-function-declaration] return (cl_object)AO_fetch_compare_and_swap((AO_t*)slot, (AO_t)old_val, (AO_t)new_val); ^ AO_HAVE_compare_and_swap /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:45:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] return (cl_object)AO_fetch_compare_and_swap((AO_t*)slot, (AO_t)old_val, (AO_t)new_val); ^ /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/src/c/main.d: In function 'si_exit': /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/src/c/main.d:856:19: warning: unused variable 'the_env' [-Wunused-variable] cl_object ^ gmake[2]: *** [Makefile:88: main.o] Error 1 gmake[2]: Leaving directory '/usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/c' gmake[1]: *** [Makefile:144: libeclmin.a] Error 2 gmake[1]: Leaving directory '/usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build' gmake: *** [Makefile:65: all] Error 2 *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2925 '/usr/ports/pobj/ecl-20.4.24/.build_done': @cd /usr/ports/pobj/ecl-20.4.24/e...) *** Error 2 in /usr/ports/mystuff/lang/ecl (/usr/ports/infrastructure/mk/bsd.port.mk:2584 'all': @lock=ecl-20.4.24; export _LOCKS_HELD=" ec...)
Re: Update lang/ecl to 20.4.24
Solene Rapenne writes: > On Tue, 28 Jul 2020 23:59:03 -0400 > George Koehler : > >> On Tue, 19 May 2020 08:59:48 -0700 >> Josh Elsasser wrote: >> >> > Here's a quick update to the new release, minimally tested as a >> > lang/sbcl build host. The patch removes files, don't forget patch -E >> > >> > diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile >> > --- /usr/ports/lang/ecl/Makefile Tue Feb 18 15:29:40 2020 >> > +++ ./Makefile Mon May 18 09:44:49 2020 >> > @@ -5,10 +5,9 @@ >> > >> > BROKEN-mips64 = ecl_min fails >> > >> > -V = 16.1.3 >> > +V = 20.4.24 >> >> This update might break sparc64. I don't have sparc64, but found a >> bug in 20.4.24 on powerpc64 that might affect other 64-bit big-endian >> arch (mips64 and sparc64). It's BROKEN-mips64, but the sparc64 snap >> has packages of clic and maxima with ecl-16.1.3.p3. >> >> The ecl update has been stuck because it breaks net/clic (as Solene >> said). In other ways, the update looks good to me. >> > > I have a fix for net/clic that I will commit when ecl update is done I don't have any exotic archs to test this with, anyone with sparc64 able to spin a ecl test? If sparc64 still works we could update this. timo
Re: Update lang/ecl to 20.4.24
On Tue, 28 Jul 2020 23:59:03 -0400 George Koehler : > On Tue, 19 May 2020 08:59:48 -0700 > Josh Elsasser wrote: > > > Here's a quick update to the new release, minimally tested as a > > lang/sbcl build host. The patch removes files, don't forget patch -E > > > > diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile > > --- /usr/ports/lang/ecl/MakefileTue Feb 18 15:29:40 2020 > > +++ ./Makefile Mon May 18 09:44:49 2020 > > @@ -5,10 +5,9 @@ > > > > BROKEN-mips64 =ecl_min fails > > > > -V =16.1.3 > > +V =20.4.24 > > This update might break sparc64. I don't have sparc64, but found a > bug in 20.4.24 on powerpc64 that might affect other 64-bit big-endian > arch (mips64 and sparc64). It's BROKEN-mips64, but the sparc64 snap > has packages of clic and maxima with ecl-16.1.3.p3. > > The ecl update has been stuck because it breaks net/clic (as Solene > said). In other ways, the update looks good to me. > I have a fix for net/clic that I will commit when ecl update is done
Re: Update lang/ecl to 20.4.24
On Tue, Jul 28, 2020 at 11:59:03PM -0400, George Koehler wrote: > This update might break sparc64. I don't have sparc64, but found a > bug in 20.4.24 on powerpc64 that might affect other 64-bit big-endian > arch (mips64 and sparc64). It's BROKEN-mips64, but the sparc64 snap > has packages of clic and maxima with ecl-16.1.3.p3. > The ecl update has been stuck because it breaks net/clic (as Solene > said). In other ways, the update looks good to me. > ecl-20.4.24 works on macppc, has the same number of failures as amd64: > Did 245 tests (0 crashed), 17999 checks. >Pass: 17912 (100%) >Fail: 87 ( 0%) > reed-alert seems to work on macppc. > I didn't try maxima on macppc. For maxima on amd64, I replicated the > test results that Timo posted, and I can run xmaxima. > For the bug in 20.4.24 that broke my powerpc64, I need to write a bug > report for upstream. ecl_min calls ecl_symbol_value() before > init_all_symbols(); reads p = q->data.value too early; gets p == 2 on > most arch, p == 0x2 on 64-bit big-endian; but if (p & 3) == 0 > then ecl_min fails with SIGSEGV. (powerpc64 also needs a diff for > lang/boehm-gc that I intend to share later.)--George I gave building it a try, it died early on with: /usr/ports/pobj/ecl-20.4.24/ecl-20.4.24/build/ecl/ecl_atomics.h:39:4: error: #er ror "ECL needs AO_fetch_compare_and_swap or an equivalent" # error "ECL needs AO_fetch_compare_and_swap or an equivalent" --Kurt
Re: Update lang/ecl to 20.4.24
On Tue, 19 May 2020 08:59:48 -0700 Josh Elsasser wrote: > Here's a quick update to the new release, minimally tested as a > lang/sbcl build host. The patch removes files, don't forget patch -E > > diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile > --- /usr/ports/lang/ecl/Makefile Tue Feb 18 15:29:40 2020 > +++ ./MakefileMon May 18 09:44:49 2020 > @@ -5,10 +5,9 @@ > > BROKEN-mips64 = ecl_min fails > > -V = 16.1.3 > +V = 20.4.24 This update might break sparc64. I don't have sparc64, but found a bug in 20.4.24 on powerpc64 that might affect other 64-bit big-endian arch (mips64 and sparc64). It's BROKEN-mips64, but the sparc64 snap has packages of clic and maxima with ecl-16.1.3.p3. The ecl update has been stuck because it breaks net/clic (as Solene said). In other ways, the update looks good to me. ecl-20.4.24 works on macppc, has the same number of failures as amd64: Did 245 tests (0 crashed), 17999 checks. Pass: 17912 (100%) Fail: 87 ( 0%) reed-alert seems to work on macppc. I didn't try maxima on macppc. For maxima on amd64, I replicated the test results that Timo posted, and I can run xmaxima. For the bug in 20.4.24 that broke my powerpc64, I need to write a bug report for upstream. ecl_min calls ecl_symbol_value() before init_all_symbols(); reads p = q->data.value too early; gets p == 2 on most arch, p == 0x2 on 64-bit big-endian; but if (p & 3) == 0 then ecl_min fails with SIGSEGV. (powerpc64 also needs a diff for lang/boehm-gc that I intend to share later.)--George
Re: Update lang/ecl to 20.4.24
On Tue, Jun 2, 2020, at 12:20, Timo Myyrä wrote: > > > On Tue, Jun 2, 2020, at 12:16, Ingo Feinerer wrote: > > On Tue, Jun 02, 2020 at 07:01:57AM +0300, Timo Myyrä wrote: > > > Did you get the maxima tests to run as well? I didn't have success yet > > > with those although the compilation worked. > > > > How did you run the tests? > > > > `make test` runs a test suite but the results are only written to a log > > file (pobj/maxima-5.43.2/maxima-5.43.2/tests/ecl-test.sh.log). As the > > tests take some time the test suite might appear to hang. > > > > The same test suite can be triggered manually if you start xmaxima and > > click on the `Maxima->Run Tests` menu entry. The output is immediately > > shown in the input/output window. > > > > Best regards, > > Ingo > > > > I did use the make test. Wondered a bit about the lack of output mut > noticed with ktrace it has doing the tests so I waited. I'll check > again later to see if the exact failure. > > Timo > > I run the tests and got following output: Running the testsuite... ;;; Loading #P"/usr/local/lib/ecl/sb-bsd-sockets.fas" ;;; Loading #P"/usr/local/lib/ecl/sockets.fas" Maxima 5.43.2 http://maxima.sourceforge.net using Lisp ECL 20.4.24 Distributed under the GNU Public License. See the file COPYING. Dedicated to the memory of William Schelter. The function bug_report() provides bug reporting information. (%i1) build_info() (%o1) Maxima version: "5.43.2" Maxima build date: "2020-05-31 08:38:24" Host type: "x86_64-unknown-openbsd6.7" Lisp implementation type: "ECL" Lisp implementation version: "20.4.24" User dir: "/maxima-5.43.2_writes_to_HOME/.maxima" Temp dir: "/tmp" Object dir: "/usr/ports/pobj/maxima-5.43.2/maxima-5.43.2/binary/5_43_2/ecl/20_4_24" Frontend: false (%i2) testsuite_files:append(["rtest_ask.mac"],testsuite_files) (%o2) [rtest_ask.mac, [rtest_rules], rtestnset, [rtest1, [115, 183, 185, 186]], [rtest1a, [33]], [rtest2, [86, 95]], rtest4, [rtest5], [rtest6, [43, 45, 46]], rtest6a, rtest6b, rtest7, rtest9, [rtest9a], [rtest10, [24, 25]], [rtest11], rtest13, rtest13s, [rtest14, [145, 201, 233, 234, 249, 250, 251, 252, 267, 297, 298, 307, 310, 312, 315, 319]], rtest15, [rtest16, [50, 524, 525, 561]], rtestode, rtestode_zp, rtest3, [rtest8, [104]], [rtest12, [76, 78]], rexamples, [rtesthyp, [105, 112, 113, 123, 124, 128]], [rtest_hypgeo, [143]], rtestmt19937, rtest_allnummod, rtestconjugate, [rtestsum, [3, 4, 18, 75]], [rtest_trig], rtest_zeta, rtest_diff_invtrig, rtest_scalarp, rtest_everysome, [rtestint, [232]], rtest_numth, rtestifactor, [rtest_equal, [157, 160]], rtest_abs, [rtest_taylor, [88, 91, 97, 104, 128, 129]], [rtest_dot], rtest_mset, rtest_boolean, rtest_round, [rtest_map, [2, 3, 4]], [rtest_sign, [21, 25, 30, 40, 65, 72, 79]], rtest_algebraic, [rtest_gamma], rtest_expintegral, rtest_signum, rtest_lambert_w, [rtest_elliptic, [129, 143]], rtest_integrate, rtest_integrate_special, [rtest_sqrt, [89]], [rtest_carg, [40, 41]], [rtest_log], [rtest_power, [19, 20, 26, 58, 65]], rtestdefstruct, [rtest_limit], rtest_powerseries, [rtest_laplace, [29, 49, 50, 51, 54, 59, 60, 61, 62, 78, 80]], rtest_plotoptions, rtest_algsys, rtest_trace] (%i3) run_testsuite(share_tests = true) Testsuite run for ECL 20.4.24: Running tests in rtest_ask.mac: 135/135 tests passed Running tests in rtest_rules: 119/119 tests passed Running tests in rtestnset: 617/617 tests passed Running tests in rtest1: ** Problem 115 (line 341) *** Input: (batch(file_search(test_readbase_maxima, file_search_tests)), test_readbase_maxima()) Result: read and interpret /usr/ports/pobj/maxima-5.43.2/maxima-5.43.2/tests/test_readbase_maxima.mac (%i1) test_readbase_maxima():=[4,3,2,1,40,30,20,10] (%o1) test_readbase_maxima() := [4, 3, 2, 1, 40, 30, 20, 10] [4, 3, 2, 1, 40, 30, 20, 10] ... Which was correct, but was expected to be wrong due to a known bug in Maxima or ECL. 185/185 tests passed (not counting 4 expected errors) The following 1 problem passed but was expected to fail: (115) Running tests in rtest1a: 34/34 tests passed (not counting 1 expected errors) Running tests in rtest2: 287/287 tests passed (not counting 2 expected errors) Running tests in rtest4: 94/94 tests passed Running tests in rtest5: 83/83 tests passed Running tests in rtest6: ** Problem 43 (line 166) *** Input: (string(2.0e-7), (%% = 2.0e-7) or (%% = 2.0E-7) or %%) Result: true ... Which was correct, but was expected to be wrong due to a known bug in Maxima or ECL. ****** Problem 45 (line 172) *** Input: 1 (string(--), (%% = 9.765625e-4) or (%%
Re: Update lang/ecl to 20.4.24
On Tue, Jun 2, 2020, at 12:16, Ingo Feinerer wrote: > On Tue, Jun 02, 2020 at 07:01:57AM +0300, Timo Myyrä wrote: > > Did you get the maxima tests to run as well? I didn't have success yet > > with those although the compilation worked. > > How did you run the tests? > > `make test` runs a test suite but the results are only written to a log > file (pobj/maxima-5.43.2/maxima-5.43.2/tests/ecl-test.sh.log). As the > tests take some time the test suite might appear to hang. > > The same test suite can be triggered manually if you start xmaxima and > click on the `Maxima->Run Tests` menu entry. The output is immediately > shown in the input/output window. > > Best regards, > Ingo > I did use the make test. Wondered a bit about the lack of output mut noticed with ktrace it has doing the tests so I waited. I'll check again later to see if the exact failure. Timo
Re: Update lang/ecl to 20.4.24
On Tue, Jun 02, 2020 at 07:01:57AM +0300, Timo Myyrä wrote: > Did you get the maxima tests to run as well? I didn't have success yet > with those although the compilation worked. How did you run the tests? `make test` runs a test suite but the results are only written to a log file (pobj/maxima-5.43.2/maxima-5.43.2/tests/ecl-test.sh.log). As the tests take some time the test suite might appear to hang. The same test suite can be triggered manually if you start xmaxima and click on the `Maxima->Run Tests` menu entry. The output is immediately shown in the input/output window. Best regards, Ingo
Re: Update lang/ecl to 20.4.24
On Sun, May 31, 2020, at 10:43, Ingo Feinerer wrote: > On Sat, May 30, 2020 at 08:32:23AM -0700, Josh Elsasser wrote: > > Maxima needs an upstream patch to build with ecl 20.4.24. This should > > be safe to commit now, before updating ecl. > > > > diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp > > b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > > new file mode 100644 > > index 000..b3fd1683402 > > --- /dev/null > > +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > > @@ -0,0 +1,17 @@ > > +$OpenBSD$ > > + > > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > > +Fix for Bug #3629, to compile with ECL 20.4.24 > > + > > +Index: lisp-utils/defsystem.lisp > > +--- lisp-utils/defsystem.lisp.orig > > ++++ lisp-utils/defsystem.lisp > > +@@ -4152,7 +4152,7 @@ the system definition, if provided." > > + #+:ecl > > + (progn > > + (ext:package-lock "CL" nil) > > +-(setf (symbol-function 'lisp:require) > > ++(setf (symbol-function 'cl:require) > > + (symbol-function 'new-require)) > > + (ext:package-lock "CL" t)) > > + #+:lispworks > > diff --git a/math/maxima/patches/patch-src_maxima_system > > b/math/maxima/patches/patch-src_maxima_system > > new file mode 100644 > > index 000..5d651aa002e > > --- /dev/null > > +++ b/math/maxima/patches/patch-src_maxima_system > > @@ -0,0 +1,18 @@ > > +$OpenBSD$ > > + > > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > > +Fix for Bug #3629, to compile with ECL 20.4.24 > > + > > +Index: src/maxima.system > > +--- src/maxima.system.orig > > src/maxima.system > > +@@ -80,8 +80,7 @@ > > + (let ((x (symbol-value (find-symbol > > "*AUTOCONF-LD-FLAGS*" > > + (find-package > > "MAXIMA") > > + (if (and x (not (string= x ""))) (list x))) > > +-:epilogue-code '(progn (require :defsystem) > > +- (cl-user::run))) > > ++:epilogue-code '(progn (cl-user::run))) > > + > > + (defun maxima-binary-pathname () > > + #+clisp > > Committed. Thanks for the patch! > > Best regards, > Ingo > > Did you get the maxima tests to run as well? I didn't have success yet with those although the compilation worked. Timo
Re: Update lang/ecl to 20.4.24
On Sat, May 30, 2020 at 08:32:23AM -0700, Josh Elsasser wrote: > Maxima needs an upstream patch to build with ecl 20.4.24. This should > be safe to commit now, before updating ecl. > > diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp > b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > new file mode 100644 > index 000..b3fd1683402 > --- /dev/null > +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp > @@ -0,0 +1,17 @@ > +$OpenBSD$ > + > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > +Fix for Bug #3629, to compile with ECL 20.4.24 > + > +Index: lisp-utils/defsystem.lisp > +--- lisp-utils/defsystem.lisp.orig > lisp-utils/defsystem.lisp > +@@ -4152,7 +4152,7 @@ the system definition, if provided." > + #+:ecl > + (progn > + (ext:package-lock "CL" nil) > +-(setf (symbol-function 'lisp:require) > ++(setf (symbol-function 'cl:require) > + (symbol-function 'new-require)) > + (ext:package-lock "CL" t)) > + #+:lispworks > diff --git a/math/maxima/patches/patch-src_maxima_system > b/math/maxima/patches/patch-src_maxima_system > new file mode 100644 > index 000..5d651aa002e > --- /dev/null > +++ b/math/maxima/patches/patch-src_maxima_system > @@ -0,0 +1,18 @@ > +$OpenBSD$ > + > +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 > +Fix for Bug #3629, to compile with ECL 20.4.24 > + > +Index: src/maxima.system > +--- src/maxima.system.orig > src/maxima.system > +@@ -80,8 +80,7 @@ > + (let ((x (symbol-value (find-symbol > "*AUTOCONF-LD-FLAGS*" > + (find-package > "MAXIMA") > + (if (and x (not (string= x ""))) (list x))) > +- :epilogue-code '(progn (require :defsystem) > +- (cl-user::run))) > ++ :epilogue-code '(progn (cl-user::run))) > + > + (defun maxima-binary-pathname () > + #+clisp Committed. Thanks for the patch! Best regards, Ingo
Re: Update lang/ecl to 20.4.24
On Tue, May 19, 2020 at 01:13:06PM -0400, Kurt Mosiejczuk wrote: > On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > > Here's a quick update to the new release, minimally tested as a > > lang/sbcl build host. The patch removes files, don't forget patch -E > > Someone should do testing with math/maxima, net/clic, and sysutils/reed-alert. > > --Kurt Maxima needs an upstream patch to build with ecl 20.4.24. This should be safe to commit now, before updating ecl. diff --git a/math/maxima/patches/patch-lisp-utils_defsystem_lisp b/math/maxima/patches/patch-lisp-utils_defsystem_lisp new file mode 100644 index 000..b3fd1683402 --- /dev/null +++ b/math/maxima/patches/patch-lisp-utils_defsystem_lisp @@ -0,0 +1,17 @@ +$OpenBSD$ + +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 +Fix for Bug #3629, to compile with ECL 20.4.24 + +Index: lisp-utils/defsystem.lisp +--- lisp-utils/defsystem.lisp.orig lisp-utils/defsystem.lisp +@@ -4152,7 +4152,7 @@ the system definition, if provided." + #+:ecl + (progn + (ext:package-lock "CL" nil) +-(setf (symbol-function 'lisp:require) ++(setf (symbol-function 'cl:require) + (symbol-function 'new-require)) + (ext:package-lock "CL" t)) + #+:lispworks diff --git a/math/maxima/patches/patch-src_maxima_system b/math/maxima/patches/patch-src_maxima_system new file mode 100644 index 000..5d651aa002e --- /dev/null +++ b/math/maxima/patches/patch-src_maxima_system @@ -0,0 +1,18 @@ +$OpenBSD$ + +Upstream commit 615b4bf8b13d55a576bc60ad04f7b17d75f49021 +Fix for Bug #3629, to compile with ECL 20.4.24 + +Index: src/maxima.system +--- src/maxima.system.orig src/maxima.system +@@ -80,8 +80,7 @@ + (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" + (find-package "MAXIMA") + (if (and x (not (string= x ""))) (list x))) +-:epilogue-code '(progn (require :defsystem) +- (cl-user::run))) ++:epilogue-code '(progn (cl-user::run))) + + (defun maxima-binary-pathname () + #+clisp
Re: Update lang/ecl to 20.4.24
On Wed, May 20, 2020, at 00:41, Solene Rapenne wrote: > Le Tue, 19 May 2020 13:13:06 -0400, > Kurt Mosiejczuk a écrit : > > > On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > > > Here's a quick update to the new release, minimally tested as a > > > lang/sbcl build host. The patch removes files, don't forget patch > > > -E > > > > Someone should do testing with math/maxima, net/clic, and > > sysutils/reed-alert. > > sysutils/reed-alert still work fine with this update > net/clic will build but fail to start, I'm investigating about this but > I think I'll have to rework a bit the code (I'm upstream for both). > > I'm very happy to see this ecl update though! > > The diff itself looks good, on ecl release I quickly tested it but got some test failures on ecl test suite and couldn't run math/maxima tests at all so i forgot it. At least the maxima tests should pass so that ecl could be updated. timo
Re: Update lang/ecl to 20.4.24
Le Tue, 19 May 2020 13:13:06 -0400, Kurt Mosiejczuk a écrit : > On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > > Here's a quick update to the new release, minimally tested as a > > lang/sbcl build host. The patch removes files, don't forget patch > > -E > > Someone should do testing with math/maxima, net/clic, and > sysutils/reed-alert. sysutils/reed-alert still work fine with this update net/clic will build but fail to start, I'm investigating about this but I think I'll have to rework a bit the code (I'm upstream for both). I'm very happy to see this ecl update though!
Re: Update lang/ecl to 20.4.24
On Tue, May 19, 2020 at 08:59:48AM -0700, Josh Elsasser wrote: > Here's a quick update to the new release, minimally tested as a > lang/sbcl build host. The patch removes files, don't forget patch -E Someone should do testing with math/maxima, net/clic, and sysutils/reed-alert. --Kurt > diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile > --- /usr/ports/lang/ecl/Makefile Tue Feb 18 15:29:40 2020 > +++ ./MakefileMon May 18 09:44:49 2020 > @@ -5,10 +5,9 @@ > > BROKEN-mips64 = ecl_min fails > > -V = 16.1.3 > +V = 20.4.24 > DISTNAME = ecl-$V > -SHARED_LIBS += ecl 6.0 > -REVISION = 3 > +SHARED_LIBS += ecl 7.0 > > HOMEPAGE = https://common-lisp.net/project/ecl/ > MAINTAINER = Timo Myyra > @@ -21,12 +20,14 @@ > > MASTER_SITES = ${HOMEPAGE}static/files/release/ > > +COMPILER = base-clang ports-gcc > USE_GMAKE = Yes > CONFIGURE_STYLE =gnu > TEST_TARGET =check > CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ > ECLLIB_VERSION=${LIBecl_VERSION} \ > - ecldir=${LOCALBASE}/lib/ecl > + ecldir=${LOCALBASE}/lib/ecl \ > + MAKEINFO=${PREFIX}/bin/gmakeinfo > > CONFIGURE_ARGS +=--enable-boehm=system \ > --enable-libatomic=system \ > @@ -38,6 +39,8 @@ > CONFIGURE_ENV += ETAGS=/usr/bin/true > > WANTLIB += atomic_ops c ffi gc gmp m pthread > + > +BUILD_DEPENDS += print/texinfo > > LIB_DEPENDS += devel/gmp \ > devel/boehm-gc,-main \ > diff -ruN --exclude .git /usr/ports/lang/ecl/distinfo ./distinfo > --- /usr/ports/lang/ecl/distinfo Mon May 15 13:40:18 2017 > +++ ./distinfoMon May 18 09:44:49 2020 > @@ -1,2 +1,2 @@ > -SHA256 (ecl-16.1.3.tgz) = dqWFxhbo+oOmtyCTJaMJ2lvAymjgZY85b0mVVjgRElQ= > -SIZE (ecl-16.1.3.tgz) = 7459212 > +SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= > +SIZE (ecl-20.4.24.tgz) = 7815444 > diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_Makefile_in > ./patches/patch-src_Makefile_in > --- /usr/ports/lang/ecl/patches/patch-src_Makefile_in Mon May 15 13:40:18 2017 > +++ ./patches/patch-src_Makefile_in Sun Mar 22 08:45:49 2020 > @@ -1,7 +1,8 @@ > $OpenBSD: patch-src_Makefile_in,v 1.6 2016/12/20 20:12:29 juanfra Exp $ > 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: > +Index: src/Makefile.in > +--- src/Makefile.in.orig > src/Makefile.in > +@@ -212,30 +212,15 @@ install: > for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ > $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ > done > @@ -18,7 +19,7 @@ > - $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ > - fi \ > -done > --if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" ]; then \ > +-if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" -a "@SONAME@" != "@SONAME3@" > ]; then \ > - ( $(INSTALL_LIBRARY) @SONAME3@ $(DESTDIR)$(libdir) && \ > -cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME2@ @SONAME1@ @SONAME@ && \ > -$(LN_S) @SONAME3@ @SONAME2@ && \ > @@ -27,12 +28,12 @@ > -fi > +${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) > +cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so > - $(INSTALL_PROGRAM) $(DPP) $(DESTDIR)$(ecldir) > + $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) > $(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir) > for i in `cat modules`; do \ > case $$i in \ > -*.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ > -+*.fas) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ > ++*.fas) $(INSTALL_SCRIPT) $$i $(DESTDIR)$(ecldir);; \ > *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ > esac \ > done > diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_c_ffi_d > ./patches/patch-src_c_ffi_d > --- /usr/ports/lang/ecl/patches/patch-src_c_ffi_d Tue Feb 18 15:29:40 2020 > +++ ./patches/patch-src_c_ffi_d Wed Dec 31 16:00:00 1969 > @@ -1,26 +0,0 @@ > -$OpenBSD: patch-src_c_ffi_d,v 1.1 2020/02/12 19:42:02 jasper Exp $ > - > -libffi for x86_64 doesn't define FFI_SYSV anymore for FFI_UNIX64 should used > instead > -fixed upstream with > https://gitlab.com/embeddable-common-lisp/ecl/commit/b2f09b4809441a92d6c11a2b39d5399580e56ae7 > - > -Index: src/c/ffi.d > src/c/ffi.
Update lang/ecl to 20.4.24
Here's a quick update to the new release, minimally tested as a lang/sbcl build host. The patch removes files, don't forget patch -E diff -ruN --exclude .git /usr/ports/lang/ecl/Makefile ./Makefile --- /usr/ports/lang/ecl/MakefileTue Feb 18 15:29:40 2020 +++ ./Makefile Mon May 18 09:44:49 2020 @@ -5,10 +5,9 @@ BROKEN-mips64 =ecl_min fails -V =16.1.3 +V =20.4.24 DISTNAME = ecl-$V -SHARED_LIBS += ecl 6.0 -REVISION = 3 +SHARED_LIBS += ecl 7.0 HOMEPAGE = https://common-lisp.net/project/ecl/ MAINTAINER = Timo Myyra @@ -21,12 +20,14 @@ MASTER_SITES = ${HOMEPAGE}static/files/release/ +COMPILER = base-clang ports-gcc USE_GMAKE =Yes CONFIGURE_STYLE = gnu TEST_TARGET = check CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ ECLLIB_VERSION=${LIBecl_VERSION} \ - ecldir=${LOCALBASE}/lib/ecl + ecldir=${LOCALBASE}/lib/ecl \ + MAKEINFO=${PREFIX}/bin/gmakeinfo CONFIGURE_ARGS += --enable-boehm=system \ --enable-libatomic=system \ @@ -38,6 +39,8 @@ CONFIGURE_ENV += ETAGS=/usr/bin/true WANTLIB += atomic_ops c ffi gc gmp m pthread + +BUILD_DEPENDS += print/texinfo LIB_DEPENDS += devel/gmp \ devel/boehm-gc,-main \ diff -ruN --exclude .git /usr/ports/lang/ecl/distinfo ./distinfo --- /usr/ports/lang/ecl/distinfoMon May 15 13:40:18 2017 +++ ./distinfo Mon May 18 09:44:49 2020 @@ -1,2 +1,2 @@ -SHA256 (ecl-16.1.3.tgz) = dqWFxhbo+oOmtyCTJaMJ2lvAymjgZY85b0mVVjgRElQ= -SIZE (ecl-16.1.3.tgz) = 7459212 +SHA256 (ecl-20.4.24.tgz) = Zwg47fJYqTa1Iv22INozbefldaoNJ+NIQXJyUnJtDwc= +SIZE (ecl-20.4.24.tgz) = 7815444 diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_Makefile_in ./patches/patch-src_Makefile_in --- /usr/ports/lang/ecl/patches/patch-src_Makefile_in Mon May 15 13:40:18 2017 +++ ./patches/patch-src_Makefile_in Sun Mar 22 08:45:49 2020 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_Makefile_in,v 1.6 2016/12/20 20:12:29 juanfra Exp $ src/Makefile.in.orig Mon Dec 19 21:24:59 2016 -+++ src/Makefile.inMon Dec 19 21:27:43 2016 -@@ -296,30 +296,15 @@ install: +Index: src/Makefile.in +--- src/Makefile.in.orig src/Makefile.in +@@ -212,30 +212,15 @@ install: for i in `(cd ecl && find . -name '*.h')`; do echo $$i; \ $(INSTALL_DATA) ecl/$$i $(DESTDIR)$(includedir)/ecl/$$i; \ done @@ -18,7 +19,7 @@ - $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ -fi \ - done -- if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" ]; then \ +- if [ "x@SONAME3@" != "x" -a -f "@SONAME3@" -a "@SONAME@" != "@SONAME3@" ]; then \ -( $(INSTALL_LIBRARY) @SONAME3@ $(DESTDIR)$(libdir) && \ - cd $(DESTDIR)$(libdir) && $(RM) -f @SONAME2@ @SONAME1@ @SONAME@ && \ - $(LN_S) @SONAME3@ @SONAME2@ && \ @@ -27,12 +28,12 @@ - fi + ${INSTALL_LIBRARY} libecl.so $(DESTDIR)$(libdir)/$(LSP_LIBRARIES) + cd $(DESTDIR)$(libdir) && ln -sf $(LSP_LIBRARIES) libecl.so - $(INSTALL_PROGRAM) $(DPP) $(DESTDIR)$(ecldir) + $(INSTALL_PROGRAM) c/$(DPP) $(DESTDIR)$(ecldir) $(INSTALL_PROGRAM) $(ECL_MIN) $(DESTDIR)$(ecldir) for i in `cat modules`; do \ case $$i in \ - *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ -+ *.fas) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ ++ *.fas) $(INSTALL_SCRIPT) $$i $(DESTDIR)$(ecldir);; \ *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ esac \ done diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_c_ffi_d ./patches/patch-src_c_ffi_d --- /usr/ports/lang/ecl/patches/patch-src_c_ffi_d Tue Feb 18 15:29:40 2020 +++ ./patches/patch-src_c_ffi_d Wed Dec 31 16:00:00 1969 @@ -1,26 +0,0 @@ -$OpenBSD: patch-src_c_ffi_d,v 1.1 2020/02/12 19:42:02 jasper Exp $ - -libffi for x86_64 doesn't define FFI_SYSV anymore for FFI_UNIX64 should used instead -fixed upstream with https://gitlab.com/embeddable-common-lisp/ecl/commit/b2f09b4809441a92d6c11a2b39d5399580e56ae7 - -Index: src/c/ffi.d src/c/ffi.d.orig -+++ src/c/ffi.d -@@ -132,10 +132,15 @@ static struct { - {@':stdcall', FFI_STDCALL}, - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, --#elif defined(X86_ANY) || defined(X86) || defined(X86_64) -+#elif defined(X86_ANY) || defined(X86) -+#if defined(X86_64) -+ {@':cdecl', FFI_UNIX64}, -+ {@':sysv', FFI_UNIX64}, -+ {@':unix64', FFI_UNIX64}, -+#else - {@':cdecl', FFI_SYSV}, - {@':sysv', FFI_SYSV}, -- {@':unix64', FFI_UNIX64}, -+#endif - #endif - }; - diff -ruN --exclude .git /usr/ports/lang/ecl/patches/patch-src_c_numbers_atan_d ./patches/patch-src_c_numbers_atan_d --- /usr/ports/lang/ecl/patches/pa
[update] ecl-16.1.3p0 (maxima fix)
Hi, ECL seems have fixed the issue causing maxima test failure (atan2). Here's backport of the commit. ECL still pass and Maxima test pass as well on amd64. While here, add myself as maintainer of ECL. Timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- Makefile20 Dec 2016 20:12:29 - 1.32 +++ Makefile28 Dec 2016 07:43:27 - @@ -9,8 +9,10 @@ BROKEN-arm = infinite loop while buildin V =16.1.3 DISTNAME = ecl-$V SHARED_LIBS += ecl 6.0 +REVISION = 0 HOMEPAGE = https://common-lisp.net/project/ecl/ +MAINTAINER = Timo Myyra <timo.my...@wickedbsd.net> SUBST_VARS = V EXTRACT_SUFX = .tgz Index: patches/patch-src_c_numbers_atan_d === RCS file: patches/patch-src_c_numbers_atan_d diff -N patches/patch-src_c_numbers_atan_d --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_c_numbers_atan_d 28 Dec 2016 07:43:27 - @@ -0,0 +1,69 @@ +$OpenBSD$ +backport commit 5199c6acd1694211a47dd558220d13fd82265ce0 to fix maxima tests. +--- src/c/numbers/atan.d.orig Mon Dec 19 12:25:00 2016 src/c/numbers/atan.d Wed Dec 28 09:12:06 2016 +@@ -22,21 +22,23 @@ + static double + ecl_atan2_double(double y, double x) + { +- if (signbit(x)) { ++ if (x == 0) { + if (signbit(y)) { +- return -ECL_PI_D + atan(-y / -x); ++ return -ECL_PI2_D; + } else if (y == 0) { +- return ECL_PI_D; ++ /* Signals floating-point-invalid-operation. If not trapped, ++ produces NaN. */ ++ return x / y; + } else { +- return ECL_PI_D - atan(y / -x); ++ return ECL_PI2_D; + } +- } else if (x == 0) { ++ } else if (signbit(x)) { + if (signbit(y)) { +- return -ECL_PI2_D; ++ return -ECL_PI_D + atan(-y / -x); + } else if (y == 0) { +- return x / y; /* Produces a NaN */ ++ return ECL_PI_D; + } else { +- return ECL_PI2_D; ++ return ECL_PI_D - atan(y / -x); + } + } else { + if (signbit(y)) { +@@ -53,21 +55,24 @@ ecl_atan2_double(double y, double x) + static long double + ecl_atan2_long_double(long double y, long double x) + { +- if (signbit(x)) { ++ if (x == 0) { + if (signbit(y)) { +- return -ECL_PI_L + atanl(-y / -x); ++ return -ECL_PI2_L; + } else if (y == 0) { +- return ECL_PI_L; ++ /* Signals floating-point-invalid-operation. If not trapped, ++ produces NaN. */ ++ return x / y; + } else { +- return ECL_PI_L - atanl(y / -x); ++ return ECL_PI2_L; + } +- } else if (x == 0) { ++ } ++ else if (signbit(x)) { + if (signbit(y)) { +- return -ECL_PI2_L; ++ return -ECL_PI_L + atanl(-y / -x); + } else if (y == 0) { +- return x / y; /* Produces a NaN */ ++ return ECL_PI_L; + } else { +- return ECL_PI2_L; ++ return ECL_PI_L - atanl(y / -x); + } + } else { + if (signbit(y)) {
[update] ecl-16.1.3
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 --- Makefile13 Oct 2016 15:14:29 - 1.31 +++ Makefile19 Dec 2016 20:13:39 - @@ -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 --- distinfo13 Mar 2016 00:18:19 - 1.8 +++ distinfo19 Dec 2016 20:13:39 - @@ -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 - 1.5 +++ patches/patch-src_Makefile_in 19 Dec 2016 20:13:39 - @@ -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.inMon Aug 24 15:28:43 2015 -@@ -173,30 +173,15 @@ install: +--- src/Makefile.in.orig Mon Dec 19 21:24:59 2016 src/Makefile.inMon 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_in29 Aug 2015 14:48:34 - 1.3 +++ patches/patch-src_compile_lsp_in19 Dec 2016 20:13:39 - @@ -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.origMon 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.origMon 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 s
Re: ecl
On Thu, Oct 13, 2016 at 05:18:32PM +0200, Jeremie Courreges-Anglas wrote: > >Replying publicly to a mail sent in private isn't considered good >practice. ;) > >-- >jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE > I sent a reply to this (but accidentally neglected to CC ports@openbsd.org), in which I claimed the e-mail I was replying to was CCing the ports list. It seems I extrapolated that CC was on given the original e-mail gave me permission to respond in private but did not ask for it. I apologise. Regards. -- Dan Andersen
Re: lang/ecl
Daniel Jakotswrites: > On Thu, 13 Oct 2016 11:26:50 +0100, Dan Andersen > wrote: > >> I don't know whether it's okay to request port maintainership but the >> patch can easily be modified if not. > > That's ok but you need a REVISION bump. Not if you only update MASTER_SITES, that part has been committed. The MAINTAINER subject has already been answered by juanfra@. Thanks, -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: ecl
Replying publicly to a mail sent in private isn't considered good practice. ;) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: ecl
On Thu, Oct 13, 2016 at 12:15:14PM +0200, Solène Rapenne wrote: >Hello, I permit to answer off-list > >I see that you want to bring some LISP to people, this is a good >thing. I would like to help spreading common lisp. If you need help when >working a the ecl port I would be happy to help you, I've been working >on the sbcl port (it may have a threads flavor soon on OpenBSD) and I >ported stumpwm (a x11 wm in common lisp). > >Ultimately, I would like to bring common lisp libraries in ports but >actually I have no idea how it could be done. The BEST thing would be to >have some kind of framework in the ports bsd.mk files like they have for >python, cpan or other languages library manager so we could use >quicklisp and this framework to import libraries easily ! :) > > >Kind regards >Solène Hi! :) Thanks a lot, I'll be happy to be able to count on your help. I'm happy to assist with the sbcl port but it's probably something well beyond my current skill level. I'll be happy to see a multithreaded sbcl run on OpenBSD once again! stumpwm would be lovely as well. I too have thought about ports and packages for Common Lisp libraries but it would need to be carefully designed so that messes like that of Debian don't happen in OpenBSD. Quicklisp makes things much easier. There's also cl-launch, which some consider to be incredibly useful. It's certainly something to consider. Regards. -- Dan Andersen
lang/ecl
I don't know whether it's okay to request port maintainership but the patch can easily be modified if not. Regards. -- Dan Andersen Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- Makefile16 Mar 2016 21:19:38 - 1.29 +++ Makefile13 Oct 2016 10:22:23 - @@ -13,13 +13,15 @@ SHARED_LIBS += ecl 5.0 HOMEPAGE = https://common-lisp.net/project/ecl/ +MAINTAINER = Dan Andersen <cl...@yandex.com> + SUBST_VARS = V EXTRACT_SUFX = .tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${HOMEPAGE}files/release/${V}/ +MASTER_SITES = ${HOMEPAGE}static/files/release/ CONFIGURE_STYLE = gnu TEST_TARGET = check
Re: lang/ecl
On Thu, 13 Oct 2016 11:26:50 +0100, Dan Andersenwrote: > I don't know whether it's okay to request port maintainership but the > patch can easily be modified if not. That's ok but you need a REVISION bump. Cheers, Daniel
Re: ecl
On Wed, Oct 12, 2016 at 08:27:12AM +0100, Dan Andersen wrote: > Hi. > > Given the lack of a maintainer for ecl, my interest in having it work on > OpenBSD, and my involvement in adding OpenBSD support to several Common Lisp > libraries, I request to become the official maintainer of ecl. You can't require to take the maintainership of a port without prior work on it. Wait until the new version, update the port, add your name to MAINTAINER and send the diff to the list. If nobody complains, you could get the maintainership. -- Juan Francisco Cantero Hurtado http://juanfra.info
ecl
Hi. Given the lack of a maintainer for ecl, my interest in having it work on OpenBSD, and my involvement in adding OpenBSD support to several Common Lisp libraries, I request to become the official maintainer of ecl. Regards. -- Dan Andersen
Re: [update] ecl-16.2 take 2
Juan Francisco Cantero Hurtado <i...@juanfra.info> writes: > On Sat, Mar 12, 2016 at 08:33:54AM +0200, Timo Myyrä wrote: > >> Hi, >> >> Seems my ports@ subscription had dropped so the late reply. >> >> Your right in that patching the missing file is a bit ugly. >> Here's take 2 to use pre-build step to issue simple copy. >> >> Timo >> >> Index: Makefile >> ======= >> RCS file: /cvs/ports/lang/ecl/Makefile,v >> retrieving revision 1.27 >> diff -u -u -p -r1.27 Makefile >> --- Makefile 25 Jan 2016 19:52:07 - 1.27 >> +++ Makefile 12 Mar 2016 06:36:04 - >> @@ -7,9 +7,9 @@ BROKEN-mips64 = ecl_min fails >> BROKEN-sparc = infinite loop while building >> BROKEN-arm =infinite loop while building >> >> -V = 16.0.0 >> +V = 16.1.2 >> DISTNAME = ecl-$V >> -SHARED_LIBS += ecl 4.0 >> +SHARED_LIBS += ecl 5.0 >> SHARED_ONLY = Yes >> >> HOMEPAGE = https://common-lisp.net/project/ecl/ >> @@ -20,7 +20,7 @@ EXTRACT_SUFX = .tgz >> # GPLv2 or later >> PERMIT_PACKAGE_CDROM = Yes >> >> -MASTER_SITES = ${HOMEPAGE}files/ >> +MASTER_SITES = ${HOMEPAGE}files/release/${V}/ >> >> CONFIGURE_STYLE = gnu >> TEST_TARGET = check >> @@ -45,5 +45,9 @@ LIB_DEPENDS += devel/gmp \ >> devel/libffi >> >> TEST_DEPENDS = ${BASE_PKGPATH} >> + >> +# XXX: Workaround for missing Copyright file >> +pre-build: >> + @cp ${WRKSRC}/{LICENSE,Copyright} > > I would prefer "post-patch" instead of "pre-build". > > BTW, why do you need copy manually the file? > >> >> .include >> Index: distinfo >> ======= >> RCS file: /cvs/ports/lang/ecl/distinfo,v >> retrieving revision 1.7 >> diff -u -u -p -r1.7 distinfo >> --- distinfo 29 Aug 2015 14:48:34 - 1.7 >> +++ distinfo 12 Mar 2016 06:36:04 - >> @@ -1,2 +1,2 @@ >> -SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM= >> -SIZE (ecl-16.0.0.tgz) = 8009304 >> +SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k= >> +SIZE (ecl-16.1.2.tgz) = 7449461 >> Index: patches/patch-src_configure >> === >> RCS file: /cvs/ports/lang/ecl/patches/patch-src_configure,v >> retrieving revision 1.6 >> diff -u -u -p -r1.6 patch-src_configure >> --- patches/patch-src_configure 29 Aug 2015 14:48:34 - 1.6 >> +++ patches/patch-src_configure 12 Mar 2016 06:36:04 - >> @@ -1,16 +1,16 @@ >> -$OpenBSD: patch-src_configure,v 1.6 2015/08/29 14:48:34 jasper Exp $ >> src/configure.orig Mon Aug 24 15:30:10 2015 >> -+++ src/configure Mon Aug 24 15:31:21 2015 >> -@@ -4948,7 +4948,7 @@ case "${host_os}" in >> -BUNDLE_LDFLAGS="-shared ${LDFLAGS}" >> -ECL_LDRPATH="-Wl,--rpath,~A" >> -clibs="-lpthread -lm" >> -- SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION" >> -+ SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}" >> -SONAME_LDFLAGS="-Wl,-soname,SONAME" >> -;; >> -solaris*) >> -@@ -9376,7 +9376,7 @@ if test ${enable_shared} = "yes"; then >> +$OpenBSD$ >> +--- 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})" >> + BUNDLE_LDFLAGS="-shared ${LDFLAGS}" >> + ECL_LDRPATH="-Wl,--rpath,~A" >> + clibs="-lpthread -lm" >> +-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 >> >> $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h >> >> Okay, here's one with copy being done in post-configure. The Copyright file is not present in the release tarball but is still referenced in Makefiles. This seems to been fixed post-rele
Re: [update] ecl-16.2 take 2
On Sat, Mar 12, 2016 at 08:33:54AM +0200, Timo Myyrä wrote: > Hi, > > Seems my ports@ subscription had dropped so the late reply. > > Your right in that patching the missing file is a bit ugly. > Here's take 2 to use pre-build step to issue simple copy. > > Timo > > Index: Makefile > ======= > RCS file: /cvs/ports/lang/ecl/Makefile,v > retrieving revision 1.27 > diff -u -u -p -r1.27 Makefile > --- Makefile 25 Jan 2016 19:52:07 - 1.27 > +++ Makefile 12 Mar 2016 06:36:04 - > @@ -7,9 +7,9 @@ BROKEN-mips64 = ecl_min fails > BROKEN-sparc = infinite loop while building > BROKEN-arm = infinite loop while building > > -V = 16.0.0 > +V = 16.1.2 > DISTNAME = ecl-$V > -SHARED_LIBS += ecl 4.0 > +SHARED_LIBS += ecl 5.0 > SHARED_ONLY =Yes > > HOMEPAGE = https://common-lisp.net/project/ecl/ > @@ -20,7 +20,7 @@ EXTRACT_SUFX = .tgz > # GPLv2 or later > PERMIT_PACKAGE_CDROM = Yes > > -MASTER_SITES = ${HOMEPAGE}files/ > +MASTER_SITES = ${HOMEPAGE}files/release/${V}/ > > CONFIGURE_STYLE =gnu > TEST_TARGET =check > @@ -45,5 +45,9 @@ LIB_DEPENDS += devel/gmp \ > devel/libffi > > TEST_DEPENDS = ${BASE_PKGPATH} > + > +# XXX: Workaround for missing Copyright file > +pre-build: > + @cp ${WRKSRC}/{LICENSE,Copyright} I would prefer "post-patch" instead of "pre-build". BTW, why do you need copy manually the file? > > .include > Index: distinfo > === > RCS file: /cvs/ports/lang/ecl/distinfo,v > retrieving revision 1.7 > diff -u -u -p -r1.7 distinfo > --- distinfo 29 Aug 2015 14:48:34 - 1.7 > +++ distinfo 12 Mar 2016 06:36:04 - > @@ -1,2 +1,2 @@ > -SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM= > -SIZE (ecl-16.0.0.tgz) = 8009304 > +SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k= > +SIZE (ecl-16.1.2.tgz) = 7449461 > Index: patches/patch-src_configure > === > RCS file: /cvs/ports/lang/ecl/patches/patch-src_configure,v > retrieving revision 1.6 > diff -u -u -p -r1.6 patch-src_configure > --- patches/patch-src_configure 29 Aug 2015 14:48:34 - 1.6 > +++ patches/patch-src_configure 12 Mar 2016 06:36:04 - > @@ -1,16 +1,16 @@ > -$OpenBSD: patch-src_configure,v 1.6 2015/08/29 14:48:34 jasper Exp $ > src/configure.orig Mon Aug 24 15:30:10 2015 > -+++ src/configureMon Aug 24 15:31:21 2015 > -@@ -4948,7 +4948,7 @@ case "${host_os}" in > - BUNDLE_LDFLAGS="-shared ${LDFLAGS}" > - ECL_LDRPATH="-Wl,--rpath,~A" > - clibs="-lpthread -lm" > --SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION" > -+SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}" > - SONAME_LDFLAGS="-Wl,-soname,SONAME" > - ;; > - solaris*) > -@@ -9376,7 +9376,7 @@ if test ${enable_shared} = "yes"; then > +$OpenBSD$ > +--- src/configure.orig Thu Mar 10 22:19:22 2016 > src/configureThu Mar 10 22:20:21 2016 > +@@ -4966,7 +4966,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})" > + BUNDLE_LDFLAGS="-shared ${LDFLAGS}" > + ECL_LDRPATH="-Wl,--rpath,~A" > + clibs="-lpthread -lm" > +-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 > > $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h > > -- Juan Francisco Cantero Hurtado http://juanfra.info
[update] ecl-16.2 take 2
Hi, Seems my ports@ subscription had dropped so the late reply. Your right in that patching the missing file is a bit ugly. Here's take 2 to use pre-build step to issue simple copy. Timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.27 diff -u -u -p -r1.27 Makefile --- Makefile25 Jan 2016 19:52:07 - 1.27 +++ Makefile12 Mar 2016 06:36:04 - @@ -7,9 +7,9 @@ BROKEN-mips64 = ecl_min fails BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V =16.0.0 +V =16.1.2 DISTNAME = ecl-$V -SHARED_LIBS += ecl 4.0 +SHARED_LIBS += ecl 5.0 SHARED_ONLY = Yes HOMEPAGE = https://common-lisp.net/project/ecl/ @@ -20,7 +20,7 @@ EXTRACT_SUFX =.tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${HOMEPAGE}files/ +MASTER_SITES = ${HOMEPAGE}files/release/${V}/ CONFIGURE_STYLE = gnu TEST_TARGET = check @@ -45,5 +45,9 @@ LIB_DEPENDS +=devel/gmp \ devel/libffi TEST_DEPENDS = ${BASE_PKGPATH} + +# XXX: Workaround for missing Copyright file +pre-build: + @cp ${WRKSRC}/{LICENSE,Copyright} .include Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.7 diff -u -u -p -r1.7 distinfo --- distinfo29 Aug 2015 14:48:34 - 1.7 +++ distinfo12 Mar 2016 06:36:04 - @@ -1,2 +1,2 @@ -SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM= -SIZE (ecl-16.0.0.tgz) = 8009304 +SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k= +SIZE (ecl-16.1.2.tgz) = 7449461 Index: patches/patch-src_configure === RCS file: /cvs/ports/lang/ecl/patches/patch-src_configure,v retrieving revision 1.6 diff -u -u -p -r1.6 patch-src_configure --- patches/patch-src_configure 29 Aug 2015 14:48:34 - 1.6 +++ patches/patch-src_configure 12 Mar 2016 06:36:04 - @@ -1,16 +1,16 @@ -$OpenBSD: patch-src_configure,v 1.6 2015/08/29 14:48:34 jasper Exp $ src/configure.orig Mon Aug 24 15:30:10 2015 -+++ src/configure Mon Aug 24 15:31:21 2015 -@@ -4948,7 +4948,7 @@ case "${host_os}" in - BUNDLE_LDFLAGS="-shared ${LDFLAGS}" - ECL_LDRPATH="-Wl,--rpath,~A" - clibs="-lpthread -lm" -- SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.SOVERSION" -+ SONAME="${SHAREDPREFIX}ecl.${SHAREDEXT}.${ECLLIB_VERSION}" - SONAME_LDFLAGS="-Wl,-soname,SONAME" - ;; - solaris*) -@@ -9376,7 +9376,7 @@ if test ${enable_shared} = "yes"; then +$OpenBSD$ +--- 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})" + BUNDLE_LDFLAGS="-shared ${LDFLAGS}" + ECL_LDRPATH="-Wl,--rpath,~A" + clibs="-lpthread -lm" +-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 $as_echo "#define ENABLE_DLOPEN 1" >>confdefs.h
Re: [update] ecl-16.1.2
On 2016-03-08, Timo Myyrä <timo.my...@wickedbsd.net> wrote: > Here is an update for latest version of ECL. > Seems that the Copyright file got renamed to LICENSE but Makefiles didn't get > updated for the release so this adds backports few patches to fix it. Wouldn't it be easier to just create a link before the build? -- Christian "naddy" Weisgerber na...@mips.inka.de
[update] ecl-16.1.2
Hi, Here is an update for latest version of ECL. Seems that the Copyright file got renamed to LICENSE but Makefiles didn't get updated for the release so this adds backports few patches to fix it. Tested lightly on amd64, runs maxima test suite without errors. Timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.27 diff -u -u -p -r1.27 Makefile --- Makefile25 Jan 2016 19:52:07 - 1.27 +++ Makefile8 Mar 2016 05:06:56 - @@ -7,9 +7,9 @@ BROKEN-mips64 = ecl_min fails BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V =16.0.0 +V =16.1.2 DISTNAME = ecl-$V -SHARED_LIBS += ecl 4.0 +SHARED_LIBS += ecl 5.0 SHARED_ONLY = Yes HOMEPAGE = https://common-lisp.net/project/ecl/ @@ -20,7 +20,7 @@ EXTRACT_SUFX =.tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${HOMEPAGE}files/ +MASTER_SITES = ${HOMEPAGE}files/release/${V}/ CONFIGURE_STYLE = gnu TEST_TARGET = check Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.7 diff -u -u -p -r1.7 distinfo --- distinfo29 Aug 2015 14:48:34 - 1.7 +++ distinfo8 Mar 2016 05:06:56 - @@ -1,2 +1,2 @@ -SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM= -SIZE (ecl-16.0.0.tgz) = 8009304 +SHA256 (ecl-16.1.2.tgz) = LUgrGgpPvV2IFDRRcDInnYCMtkBeIt2R721zNTRGS5k= +SIZE (ecl-16.1.2.tgz) = 7449461 Index: patches/patch-Makefile_in === RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-Makefile_in 8 Mar 2016 05:06:56 - @@ -0,0 +1,13 @@ +$OpenBSD$ +--- Makefile.in.orig Tue Mar 8 06:41:52 2016 Makefile.inTue Mar 8 06:42:29 2016 +@@ -50,7 +50,7 @@ mandir=@mandir@ + libdir=@libdir@ + + # What to release +-TAR_CONTENTS=Makefile.in README.1st LGPL ANNOUNCEMENT Copyright doc \ ++TAR_CONTENTS=Makefile.in README.md LGPL ANNOUNCEMENT LICENSE doc \ + configure src/c src/cmp src/clos src/CHANGELOG src/lsp src/doc \ + src/h src/gmp src/config* src/install.sh src/Makefile.in \ + src/util contrib/ src/clx src/gc src/*.in src/*.m4 src/gabriel \ Index: patches/patch-src_Makefile_in === RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.5 diff -u -u -p -r1.5 patch-src_Makefile_in --- patches/patch-src_Makefile_in 29 Aug 2015 14:48:34 - 1.5 +++ patches/patch-src_Makefile_in 8 Mar 2016 05:06:56 - @@ -1,7 +1,7 @@ $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.inMon Aug 24 15:28:43 2015 -@@ -173,30 +173,15 @@ install: +--- src/Makefile.in.orig Thu Feb 25 09:06:19 2016 src/Makefile.inTue Mar 8 06:43:19 2016 +@@ -176,34 +176,19 @@ install: done $(RM) -f $(DESTDIR)$(includedir)/ecl/config.h mv $(DESTDIR)$(includedir)/ecl/config-install.h $(DESTDIR)$(includedir)/ecl/config.h @@ -36,3 +36,17 @@ $OpenBSD: patch-src_Makefile_in,v 1.5 20 *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ esac \ done +- for i in Copyright LGPL; do \ ++ for i in LICENSE LGPL; do \ + $(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(ecldir); \ + done + $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext) +@@ -217,7 +202,7 @@ flatinstall: build-stamp + uninstall: + for i in $(TARGETS) ecl-config; do $(RM) $(DESTDIR)$(bindir)/$$i; done + $(RM) -r $(DESTDIR)$(includedir)/ecl $(DESTDIR)$(ecldir) +- for i in $(LSP_LIBRARIES) $(LIBRARIES) Copyright LGPL; do \ ++ for i in $(LSP_LIBRARIES) $(LIBRARIES) LICENSE LGPL; do \ + $(RM) $(DESTDIR)$(libdir)/$$i || : ; \ + done + $(RM) -f $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext) 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 -u -p -r1.3 patch-src_compile_lsp_in --- patches/patch-src_compile_lsp_in29 Aug 2015 14:48:34 - 1.3 +++ patches/patch-src_compile_lsp_in8 Mar 2016 05:06:56 - @@ -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.origMon 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.origThu Feb 25 09:06:19 2016 src/compile.lsp.in Tue Mar 8 06:41:44 2016 +@@ -74,19 +74,19 @@ "@LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @FASL_LIBS@
Re: UPDATE: ECL-15.3.7
On 2015/08/28 17:14, Timo Myyrä wrote: -lib/ecl-${V}/sockets.fas +lib/${FULLPKGNAME}/ Keep the ecl-${V} style, you can't normally use FULLPKGNAME in pkg/PLIST (except for pkg-readmes).
Re: UPDATE: ECL-15.3.7
Juan Francisco Cantero Hurtado i...@juanfra.info writes: On Sat, Aug 22, 2015 at 11:31:17PM +0300, Timo Myyrä wrote: Jasper Lievisse Adriaanse jas...@openbsd.org writes: On Fri, Aug 21, 2015 at 11:43:57AM +0300, Timo Myyr?? wrote: Hi, I've been looking at this upgrade for a while. The Makefile's CONFIGURE_ARGS enable-threads arg should be removed. The current value 'pthreads' is incorrect and instead of failing it just disables thread support. This is my mistake, I think I confused it with boehm-gc when ecl was previously updated. The default option for threads is 'auto' so the whole flag could be just removed to enable threads support. About the tests, currently they fail but upstream fixed the test material fetching to use curl directly after 15.3.7 release. We could make curl an test dependency. And have it fetch files from the web during 'make test'? That sounds bad. If possible we should mirror the file set somewhere so we can checksum it. Yeah, it would make sense to verify the test data before using it. Just to clarify jasper's words: the port only should to download data during make fetch, everything else is forbidden. Test the ports with env USE_SYSTRACE=Yes make something is always a good idea :) One issue that has prevented me from posting an update is that I get following when doing 'make package': LIB_DEPENDS devel/boehm-gc, -atomic not needed for lang/ecl? |library atomic_ops-1.3 not found I haven't figured out why its complaining about that. Doesn't happen here; are you fully -current? Yes, I should be pretty close to current. Though I had some other vague issue with other ports as well I couldn't replicate on another computer running the same snapshot. I'm assuming I've made some mistake in some update along the path which is causing these. Probably easiest to do reinstall and check if that will help. In any case, I think we should wait a bit. There's new release coming for ECL and it would include some of the local patches. Excellent. Timo 21.8.2015, 10:38, Jasper Lievisse Adriaanse kirjoitti: On Mon, May 18, 2015 at 02:39:31AM +0200, Juan Francisco Cantero Hurtado wrote: On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyr? wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? It's the same as with the current in-tree version actually, so it's not a regression. === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info Here's an updated diff which incorporates upstream's fix for the issue Timo reported. Maxima still seems happy. OK? Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 19 Jul 2015 02:14:57 - 1.24 +++ Makefile 21 Aug 2015 07:26:37 - @@ -6,13 +6,11 @@ CATEGORIES = lang BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V = 13.5.1 +V = 15.3.7 DISTNAME = ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX = .tgz @@ -41,6 +39,8 @@ LIB_DEPENDS += devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB += atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 11 Jun 2013 10:30:54 - 1.6 +++ distinfo 21 Aug 2015 07:26:37 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch
Re: UPDATE: ECL-15.3.7
On 2015/08/28 18:41, Timo Myyrä wrote: Stuart Henderson st...@openbsd.org writes: On 2015/08/28 17:14, Timo Myyrä wrote: -lib/ecl-${V}/sockets.fas +lib/${FULLPKGNAME}/ Keep the ecl-${V} style, you can't normally use FULLPKGNAME in pkg/PLIST (except for pkg-readmes). Is there easier way than to just hand-edit the PLIST after the update-plist? timo If there's a way to set a different path that doesn't include the version number (e.g. lib/ecl) then that would do the trick..
Re: UPDATE: ECL-15.3.7
Stuart Henderson st...@openbsd.org writes: On 2015/08/28 17:14, Timo Myyrä wrote: -lib/ecl-${V}/sockets.fas +lib/${FULLPKGNAME}/ Keep the ecl-${V} style, you can't normally use FULLPKGNAME in pkg/PLIST (except for pkg-readmes). Is there easier way than to just hand-edit the PLIST after the update-plist? timo
Re: UPDATE: ECL-15.3.7
Stuart Henderson st...@openbsd.org writes: On 2015/08/28 18:41, Timo Myyrä wrote: Stuart Henderson st...@openbsd.org writes: On 2015/08/28 17:14, Timo Myyrä wrote: -lib/ecl-${V}/sockets.fas +lib/${FULLPKGNAME}/ Keep the ecl-${V} style, you can't normally use FULLPKGNAME in pkg/PLIST (except for pkg-readmes). Is there easier way than to just hand-edit the PLIST after the update-plist? timo If there's a way to set a different path that doesn't include the version number (e.g. lib/ecl) then that would do the trick.. Ok, how about following diff: Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -u -p -r1.24 Makefile --- Makefile19 Jul 2015 02:14:57 - 1.24 +++ Makefile28 Aug 2015 17:39:55 - @@ -6,30 +6,29 @@ CATEGORIES = lang BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V =13.5.1 +V =16.0.0 DISTNAME = ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 +HOMEPAGE = https://common-lisp.net/project/ecl/ -HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX = .tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} +MASTER_SITES = ${HOMEPAGE}files/ CONFIGURE_STYLE = gnu TEST_TARGET = check CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ - ECLLIB_VERSION=${LIBecl_VERSION} + ECLLIB_VERSION=${LIBecl_VERSION} \ + ecldir=${LOCALBASE}/lib/ecl CONFIGURE_ARGS += --enable-boehm=system \ --enable-libatomic=system \ - --enable-threads=pthreads \ --with-system-gmp \ --with-gmp-prefix=${LOCALBASE} @@ -41,6 +40,8 @@ LIB_DEPENDS +=devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB += atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -u -p -r1.6 distinfo --- distinfo11 Jun 2013 10:30:54 - 1.6 +++ distinfo28 Aug 2015 17:39:55 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-16.0.0.tgz) = ND7Uw+SQZWJ1emA5uFzhbTPdXoAB10AEk2eVmD468DM= +SIZE (ecl-16.0.0.tgz) = 8009304 Index: patches/patch-src_Makefile_in === RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.4 diff -u -u -p -r1.4 patch-src_Makefile_in --- patches/patch-src_Makefile_in 11 Jun 2013 10:30:54 - 1.4 +++ patches/patch-src_Makefile_in 28 Aug 2015 17:39:55 - @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.4 2013/06/11 10:30:54 sthen Exp $ src/Makefile.in.orig Mon May 27 23:37:36 2013 -+++ src/Makefile.inMon Jun 10 17:44:28 2013 -@@ -166,30 +166,15 @@ install: +$OpenBSD$ +--- src/Makefile.in.orig Mon Aug 24 15:25:08 2015 src/Makefile.inMon Aug 24 15:28:43 2015 +@@ -173,30 +173,15 @@ install: done $(RM) -f $(DESTDIR)$(includedir)/ecl/config.h mv $(DESTDIR)$(includedir)/ecl/config-install.h $(DESTDIR)$(includedir)/ecl/config.h @@ -18,9 +18,9 @@ $OpenBSD: patch-src_Makefile_in,v 1.4 20 - $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ -fi \ - done -- if [ x@SONAME@ != x -a -f @SONAME@ ]; then \ --( cd $(DESTDIR)$(libdir) $(RM) -f @SONAME3@ @SONAME2@ @SONAME1@ \ -- mv @SONAME@ @SONAME3@ \ +- if [ x@SONAME3@ != x -a -f @SONAME3@ ]; then \ +-( $(INSTALL_LIBRARY) @SONAME3@ $(DESTDIR)$(libdir) \ +- cd $(DESTDIR)$(libdir) $(RM) -f @SONAME2@ @SONAME1@ @SONAME@ \ - $(LN_S) @SONAME3@ @SONAME2@ \ - $(LN_S) @SONAME3@ @SONAME1@ \ - $(LN_S) @SONAME3@ @SONAME@ ) \ Index: patches/patch-src_cmp_cmpmain_lsp === RCS file: patches/patch-src_cmp_cmpmain_lsp diff -N patches/patch-src_cmp_cmpmain_lsp --- patches/patch-src_cmp_cmpmain_lsp 11 Jun 2013 10:30:54 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,43 +0,0 @@ -$OpenBSD: patch-src_cmp_cmpmain_lsp,v 1.1 2013/06/11 10:30:54 sthen Exp $ src/cmp/cmpmain.lsp.orig Sun Jun 9 11:01:16 2013 -+++ src/cmp/cmpmain.lspSun Jun 9 11:00:58 2013 -@@ -269,7 +269,8 @@ void ~A(cl_object cblock) - Cblock-cblock.next = current; - } - ~A --}) -+} -+) - - (defconstant +lisp-program-main+ - extern int -@@ -282,7 +283,8 @@ main(int argc
Re: UPDATE: ECL-15.3.7
Jasper Lievisse Adriaanse jas...@openbsd.org writes: On Fri, Aug 21, 2015 at 11:43:57AM +0300, Timo Myyr?? wrote: Hi, I've been looking at this upgrade for a while. The Makefile's CONFIGURE_ARGS enable-threads arg should be removed. The current value 'pthreads' is incorrect and instead of failing it just disables thread support. This is my mistake, I think I confused it with boehm-gc when ecl was previously updated. The default option for threads is 'auto' so the whole flag could be just removed to enable threads support. About the tests, currently they fail but upstream fixed the test material fetching to use curl directly after 15.3.7 release. We could make curl an test dependency. And have it fetch files from the web during 'make test'? That sounds bad. If possible we should mirror the file set somewhere so we can checksum it. Yeah, it would make sense to verify the test data before using it. One issue that has prevented me from posting an update is that I get following when doing 'make package': LIB_DEPENDS devel/boehm-gc, -atomic not needed for lang/ecl? |library atomic_ops-1.3 not found I haven't figured out why its complaining about that. Doesn't happen here; are you fully -current? Yes, I should be pretty close to current. Though I had some other vague issue with other ports as well I couldn't replicate on another computer running the same snapshot. I'm assuming I've made some mistake in some update along the path which is causing these. Probably easiest to do reinstall and check if that will help. In any case, I think we should wait a bit. There's new release coming for ECL and it would include some of the local patches. Excellent. Timo 21.8.2015, 10:38, Jasper Lievisse Adriaanse kirjoitti: On Mon, May 18, 2015 at 02:39:31AM +0200, Juan Francisco Cantero Hurtado wrote: On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyr? wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? It's the same as with the current in-tree version actually, so it's not a regression. === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info Here's an updated diff which incorporates upstream's fix for the issue Timo reported. Maxima still seems happy. OK? Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile19 Jul 2015 02:14:57 - 1.24 +++ Makefile21 Aug 2015 07:26:37 - @@ -6,13 +6,11 @@ CATEGORIES = lang BROKEN-sparc =infinite loop while building BROKEN-arm = infinite loop while building -V =13.5.1 +V =15.3.7 DISTNAME =ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE =http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX =.tgz @@ -41,6 +39,8 @@ LIB_DEPENDS +=devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB +=atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo11 Jun 2013 10:30:54 - 1.6 +++ distinfo21 Aug 2015 07:26:37 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch-src_c_unixint_d === RCS file: patches/patch-src_c_unixint_d diff -N patches/patch-src_c_unixint_d --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_c_unixint_d 21 Aug 2015 07:26:37 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +signals: Don't block GC suspend/resume signals on interrupt thread +https://gitlab.com/embeddable-common-lisp/ecl
Re: UPDATE: ECL-15.3.7
On Sat, Aug 22, 2015 at 11:31:17PM +0300, Timo Myyrä wrote: Jasper Lievisse Adriaanse jas...@openbsd.org writes: On Fri, Aug 21, 2015 at 11:43:57AM +0300, Timo Myyr?? wrote: Hi, I've been looking at this upgrade for a while. The Makefile's CONFIGURE_ARGS enable-threads arg should be removed. The current value 'pthreads' is incorrect and instead of failing it just disables thread support. This is my mistake, I think I confused it with boehm-gc when ecl was previously updated. The default option for threads is 'auto' so the whole flag could be just removed to enable threads support. About the tests, currently they fail but upstream fixed the test material fetching to use curl directly after 15.3.7 release. We could make curl an test dependency. And have it fetch files from the web during 'make test'? That sounds bad. If possible we should mirror the file set somewhere so we can checksum it. Yeah, it would make sense to verify the test data before using it. Just to clarify jasper's words: the port only should to download data during make fetch, everything else is forbidden. Test the ports with env USE_SYSTRACE=Yes make something is always a good idea :) One issue that has prevented me from posting an update is that I get following when doing 'make package': LIB_DEPENDS devel/boehm-gc, -atomic not needed for lang/ecl? |library atomic_ops-1.3 not found I haven't figured out why its complaining about that. Doesn't happen here; are you fully -current? Yes, I should be pretty close to current. Though I had some other vague issue with other ports as well I couldn't replicate on another computer running the same snapshot. I'm assuming I've made some mistake in some update along the path which is causing these. Probably easiest to do reinstall and check if that will help. In any case, I think we should wait a bit. There's new release coming for ECL and it would include some of the local patches. Excellent. Timo 21.8.2015, 10:38, Jasper Lievisse Adriaanse kirjoitti: On Mon, May 18, 2015 at 02:39:31AM +0200, Juan Francisco Cantero Hurtado wrote: On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyr? wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? It's the same as with the current in-tree version actually, so it's not a regression. === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info Here's an updated diff which incorporates upstream's fix for the issue Timo reported. Maxima still seems happy. OK? Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 19 Jul 2015 02:14:57 - 1.24 +++ Makefile 21 Aug 2015 07:26:37 - @@ -6,13 +6,11 @@ CATEGORIES =lang BROKEN-sparc = infinite loop while building BROKEN-arm =infinite loop while building -V = 13.5.1 +V = 15.3.7 DISTNAME = ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS =V EXTRACT_SUFX = .tgz @@ -41,6 +39,8 @@ LIB_DEPENDS += devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB += atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 11 Jun 2013 10:30:54 - 1.6 +++ distinfo 21 Aug 2015 07:26:37 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch-src_c_unixint_d
Re: UPDATE: ECL-15.3.7
On Mon, May 18, 2015 at 02:39:31AM +0200, Juan Francisco Cantero Hurtado wrote: On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyr? wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? It's the same as with the current in-tree version actually, so it's not a regression. === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info Here's an updated diff which incorporates upstream's fix for the issue Timo reported. Maxima still seems happy. OK? Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile19 Jul 2015 02:14:57 - 1.24 +++ Makefile21 Aug 2015 07:26:37 - @@ -6,13 +6,11 @@ CATEGORIES = lang BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V =13.5.1 +V =15.3.7 DISTNAME = ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX = .tgz @@ -41,6 +39,8 @@ LIB_DEPENDS +=devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB += atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo11 Jun 2013 10:30:54 - 1.6 +++ distinfo21 Aug 2015 07:26:37 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch-src_c_unixint_d === RCS file: patches/patch-src_c_unixint_d diff -N patches/patch-src_c_unixint_d --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_c_unixint_d 21 Aug 2015 07:26:37 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +signals: Don't block GC suspend/resume signals on interrupt thread +https://gitlab.com/embeddable-common-lisp/ecl/commit/2b1892a47ee877be7576e669f3d1b0eb04d48a2f + +--- src/c/unixint.d.orig Fri Aug 21 09:23:09 2015 src/c/unixint.dFri Aug 21 09:24:14 2015 +@@ -526,7 +526,7 @@ asynchronous_signal_servicing_thread() + const cl_env_ptr the_env = ecl_process_env(); + int interrupt_signal = -1; + /* +- * We block all signals except the usual interrupt thread. ++ * We block all signals except the usual interrupt thread and GC signals. +*/ + { + sigset_t handled_set; +@@ -535,6 +535,8 @@ asynchronous_signal_servicing_thread() + interrupt_signal = + ecl_option_values[ECL_OPT_THREAD_INTERRUPT_SIGNAL]; + sigdelset(handled_set, interrupt_signal); ++ sigdelset(handled_set, GC_get_suspend_signal()); ++ sigdelset(handled_set, GC_get_thr_restart_signal()); + } + pthread_sigmask(SIG_BLOCK, handled_set, NULL); + } Index: patches/patch-src_cmp_cmpmain_lsp === RCS file: patches/patch-src_cmp_cmpmain_lsp diff -N patches/patch-src_cmp_cmpmain_lsp --- patches/patch-src_cmp_cmpmain_lsp 11 Jun 2013 10:30:54 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,43 +0,0 @@ -$OpenBSD: patch-src_cmp_cmpmain_lsp,v 1.1 2013/06/11 10:30:54 sthen Exp $ src/cmp/cmpmain.lsp.orig Sun Jun 9 11:01:16 2013 -+++ src/cmp/cmpmain.lspSun Jun 9 11:00:58 2013 -@@ -269,7 +269,8 @@ void ~A(cl_object cblock) - Cblock-cblock.next = current; - } - ~A --}) -+} -+) - - (defconstant +lisp-program-main+ - extern int -@@ -282,7 +283,8 @@ main(int argc, char **argv) - ~A - } ECL_CATCH_ALL_END; - si_exit(0); --}) -+} -+) - - (defconstant +lisp-library-main
Re: UPDATE: ECL-15.3.7
Hi, I've been looking at this upgrade for a while. The Makefile's CONFIGURE_ARGS enable-threads arg should be removed. The current value 'pthreads' is incorrect and instead of failing it just disables thread support. This is my mistake, I think I confused it with boehm-gc when ecl was previously updated. The default option for threads is 'auto' so the whole flag could be just removed to enable threads support. About the tests, currently they fail but upstream fixed the test material fetching to use curl directly after 15.3.7 release. We could make curl an test dependency. One issue that has prevented me from posting an update is that I get following when doing 'make package': LIB_DEPENDS devel/boehm-gc, -atomic not needed for lang/ecl? |library atomic_ops-1.3 not found I haven't figured out why its complaining about that. In any case, I think we should wait a bit. There's new release coming for ECL and it would include some of the local patches. Timo 21.8.2015, 10:38, Jasper Lievisse Adriaanse kirjoitti: On Mon, May 18, 2015 at 02:39:31AM +0200, Juan Francisco Cantero Hurtado wrote: On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyr? wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? It's the same as with the current in-tree version actually, so it's not a regression. === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info Here's an updated diff which incorporates upstream's fix for the issue Timo reported. Maxima still seems happy. OK? Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile19 Jul 2015 02:14:57 - 1.24 +++ Makefile21 Aug 2015 07:26:37 - @@ -6,13 +6,11 @@ CATEGORIES = lang BROKEN-sparc =infinite loop while building BROKEN-arm = infinite loop while building -V = 13.5.1 +V =15.3.7 DISTNAME =ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE =http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX =.tgz @@ -41,6 +39,8 @@ LIB_DEPENDS +=devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB += atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo11 Jun 2013 10:30:54 - 1.6 +++ distinfo21 Aug 2015 07:26:37 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch-src_c_unixint_d === RCS file: patches/patch-src_c_unixint_d diff -N patches/patch-src_c_unixint_d --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_c_unixint_d 21 Aug 2015 07:26:37 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +signals: Don't block GC suspend/resume signals on interrupt thread +https://gitlab.com/embeddable-common-lisp/ecl/commit/2b1892a47ee877be7576e669f3d1b0eb04d48a2f + +--- src/c/unixint.d.orig Fri Aug 21 09:23:09 2015 src/c/unixint.dFri Aug 21 09:24:14 2015 +@@ -526,7 +526,7 @@ asynchronous_signal_servicing_thread() + const cl_env_ptr the_env = ecl_process_env(); + int interrupt_signal = -1; + /* +- * We block all signals except the usual interrupt thread. ++ * We block all signals except the usual interrupt thread and GC signals. +*/ + { + sigset_t handled_set; +@@ -535,6 +535,8 @@ asynchronous_signal_servicing_thread() + interrupt_signal = + ecl_option_values[ECL_OPT_THREAD_INTERRUPT_SIGNAL]; + sigdelset(handled_set, interrupt_signal); ++ sigdelset(handled_set, GC_get_suspend_signal
Re: UPDATE: ECL-15.3.7
On Fri, Aug 21, 2015 at 11:43:57AM +0300, Timo Myyr?? wrote: Hi, I've been looking at this upgrade for a while. The Makefile's CONFIGURE_ARGS enable-threads arg should be removed. The current value 'pthreads' is incorrect and instead of failing it just disables thread support. This is my mistake, I think I confused it with boehm-gc when ecl was previously updated. The default option for threads is 'auto' so the whole flag could be just removed to enable threads support. About the tests, currently they fail but upstream fixed the test material fetching to use curl directly after 15.3.7 release. We could make curl an test dependency. And have it fetch files from the web during 'make test'? That sounds bad. If possible we should mirror the file set somewhere so we can checksum it. One issue that has prevented me from posting an update is that I get following when doing 'make package': LIB_DEPENDS devel/boehm-gc, -atomic not needed for lang/ecl? |library atomic_ops-1.3 not found I haven't figured out why its complaining about that. Doesn't happen here; are you fully -current? In any case, I think we should wait a bit. There's new release coming for ECL and it would include some of the local patches. Excellent. Timo 21.8.2015, 10:38, Jasper Lievisse Adriaanse kirjoitti: On Mon, May 18, 2015 at 02:39:31AM +0200, Juan Francisco Cantero Hurtado wrote: On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyr? wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? It's the same as with the current in-tree version actually, so it's not a regression. === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info Here's an updated diff which incorporates upstream's fix for the issue Timo reported. Maxima still seems happy. OK? Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile 19 Jul 2015 02:14:57 - 1.24 +++ Makefile 21 Aug 2015 07:26:37 - @@ -6,13 +6,11 @@ CATEGORIES = lang BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V = 13.5.1 +V = 15.3.7 DISTNAME = ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX = .tgz @@ -41,6 +39,8 @@ LIB_DEPENDS += devel/gmp \ devel/boehm-gc,-main \ devel/boehm-gc,-atomic \ devel/libffi + +TEST_DEPENDS = ${BASE_PKGPATH} WANTLIB += atomic_ops c ffi gc gmp m pthread Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 11 Jun 2013 10:30:54 - 1.6 +++ distinfo 21 Aug 2015 07:26:37 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch-src_c_unixint_d === RCS file: patches/patch-src_c_unixint_d diff -N patches/patch-src_c_unixint_d --- /dev/null1 Jan 1970 00:00:00 - +++ patches/patch-src_c_unixint_d21 Aug 2015 07:26:37 - @@ -0,0 +1,25 @@ +$OpenBSD$ + +signals: Don't block GC suspend/resume signals on interrupt thread +https://gitlab.com/embeddable-common-lisp/ecl/commit/2b1892a47ee877be7576e669f3d1b0eb04d48a2f + +--- src/c/unixint.d.origFri Aug 21 09:23:09 2015 src/c/unixint.d Fri Aug 21 09:24:14 2015 +@@ -526,7 +526,7 @@ asynchronous_signal_servicing_thread() +const cl_env_ptr the_env = ecl_process_env(); +int interrupt_signal = -1; +/* +-* We block all signals except the usual interrupt thread. ++* We block all signals except the usual interrupt thread and GC signals. + */ +{ +sigset_t
Re: UPDATE: ECL-15.3.7
On Sun, May 17, 2015 at 10:08:37PM +0300, Timo Myyrä wrote: Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. The tests don't work on my computer. Do you see the same errors? === Regression tests for ecl-15.3.7 cd build make check cd tests make make do-ansi ecl -norc -load config.lsp -eval '(ecl-tests::ensure-ansi-tests)' -eval '(ext:quit)' /dev/null ;;; Loading /usr/write-ports/pobj/ecl-15.3.7/ecl-15.3.7/build/tests/config.lsp An error occurred during initialization: The assertion (STRING-EQUAL ECL-CURL::URL http://; :END1 7) failed. *** Error 1 in build/tests (Makefile:31 'ansi-tests') *** Error 1 in build/tests (Makefile:9 'output.ecl/ansi.log') -- Juan Francisco Cantero Hurtado http://juanfra.info
UPDATE: ECL-15.3.7
Hi, Here's update for ECL. Slightly tested on amd64 by building maxima port. This fixes the broken --enable-threads flag. I've disabled the threads as threaded build doesn't seem to work as build gets stuck in after compiling bootstrap compiler. I've opened an issue with upstream about it [1]. Timo [1] https://gitlab.com/embeddable-common-lisp/ecl/issues/71 Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.23 diff -u -u -p -r1.23 Makefile --- Makefile11 Jul 2014 13:10:53 - 1.23 +++ Makefile17 May 2015 18:58:16 - @@ -6,13 +6,11 @@ CATEGORIES = lang BROKEN-sparc = infinite loop while building BROKEN-arm = infinite loop while building -V =13.5.1 +V =15.3.7 DISTNAME = ecl-$V -SHARED_LIBS += ecl 3.0 +SHARED_LIBS += ecl 4.0 SHARED_ONLY = Yes -REVISION = 1 - HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V EXTRACT_SUFX = .tgz @@ -31,7 +29,7 @@ FLAVOR ?= CONFIGURE_ARGS += --enable-boehm=system \ --enable-libatomic=system \ - --enable-threads=pthreads \ + --enable-threads=no \ --with-system-gmp \ --with-gmp-prefix=${LOCALBASE} Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.6 diff -u -u -p -r1.6 distinfo --- distinfo11 Jun 2013 10:30:54 - 1.6 +++ distinfo17 May 2015 18:58:16 - @@ -1,2 +1,2 @@ -SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= -SIZE (ecl-13.5.1.tgz) = 9401163 +SHA256 (ecl-15.3.7.tgz) = Lcb/u/Hgp7EyPUmpkbofAFEnyj4VNlHZG6nmW9rslI8= +SIZE (ecl-15.3.7.tgz) = 8755180 Index: patches/patch-src_cmp_cmpmain_lsp === RCS file: patches/patch-src_cmp_cmpmain_lsp diff -N patches/patch-src_cmp_cmpmain_lsp --- patches/patch-src_cmp_cmpmain_lsp 11 Jun 2013 10:30:54 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,43 +0,0 @@ -$OpenBSD: patch-src_cmp_cmpmain_lsp,v 1.1 2013/06/11 10:30:54 sthen Exp $ src/cmp/cmpmain.lsp.orig Sun Jun 9 11:01:16 2013 -+++ src/cmp/cmpmain.lspSun Jun 9 11:00:58 2013 -@@ -269,7 +269,8 @@ void ~A(cl_object cblock) - Cblock-cblock.next = current; - } - ~A --}) -+} -+) - - (defconstant +lisp-program-main+ - extern int -@@ -282,7 +283,8 @@ main(int argc, char **argv) - ~A - } ECL_CATCH_ALL_END; - si_exit(0); --}) -+} -+) - - (defconstant +lisp-library-main+ - extern int -@@ -294,7 +296,8 @@ extern int - ecl_init_module(OBJNULL, ~A); - ~A - } ECL_CATCH_ALL_END; --}) -+} -+) - - #+:win32 - (defconstant +lisp-program-winmain+ -@@ -312,7 +315,8 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - ~A - } ECL_CATCH_ALL_END; - si_exit(0); --}) -+} -+) - - (defun guess-kind (pathname) - Given a file name, guess whether it is an object file, a library, a program Index: patches/patch-src_doc_ecl_man_in === RCS file: patches/patch-src_doc_ecl_man_in diff -N patches/patch-src_doc_ecl_man_in --- patches/patch-src_doc_ecl_man_in11 Jun 2013 10:30:54 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_doc_ecl_man_in,v 1.1 2013/06/11 10:30:54 sthen Exp $ src/doc/ecl.man.in.origSun Jun 9 17:33:18 2013 -+++ src/doc/ecl.man.in Sun Jun 9 17:33:27 2013 -@@ -7,11 +7,9 @@ ecl \- Embeddable Common LISP - [\fB\-dir\fP \fIdir\fP] - [\fB\-load\fP \fIfile\fP] - [\fB\-eval\fP \fIexpr\fP] --.if n .ti +4 --.if t .ti +.5i -+.br - [\fB\-compile\fP \fIfile\fP --.if n .ti +8 --.if t .ti +.5i -+.br - [\fB\-o\fP \fIofile\fP] - [\fB\-c\fP [\fIcfile\fP]] - [\fB\-h\fP [\fIhfile\fP]] Index: pkg/PLIST === RCS file: /cvs/ports/lang/ecl/pkg/PLIST,v retrieving revision 1.6 diff -u -u -p -r1.6 PLIST --- pkg/PLIST 11 Jun 2013 10:30:54 - 1.6 +++ pkg/PLIST 17 May 2015 18:58:16 - @@ -26,209 +26,209 @@ include/ecl/object.h include/ecl/page.h include/ecl/stacks.h include/ecl/unify.h -lib/ecl-${V}/ -lib/ecl-${V}/Copyright -lib/ecl-${V}/LGPL -lib/ecl-${V}/asdf.fas -lib/ecl-${V}/cmp.asd -lib/ecl-${V}/cmp.fas -lib/ecl-${V}/deflate.asd -lib/ecl-${V}/deflate.fas -lib/ecl-${V}/defsystem.asd -lib/ecl-${V}/defsystem.fas -@bin lib/ecl-${V}/dpp -lib/ecl-${V}/ecl-cdb.asd -lib/ecl-${V}/ecl-cdb.fas -lib/ecl-${V}/ecl-curl.asd -lib/ecl-${V}/ecl-curl.fas -lib/ecl-${V}/ecl-help.asd -lib/ecl-${V}/ecl-help.fas -lib/ecl-${V}/ecl-quicklisp.asd -lib/ecl-${V}/ecl-quicklisp.fas -@bin lib/ecl-${V}/ecl_min -lib/ecl-${V}/encodings/ -lib/ecl-${V}/encodings/arabic -lib/ecl-${V}/encodings/ascii -lib/ecl-${V}/encodings/asmo-708 -lib/ecl-${V}/encodings
ECL gets stuck with threads enabled
Hi, Any ideas what could cause lang/ECL to get 'stuck' when trying to build it with threads enabled? The build seems to go just fine, it builds the minimal ecl and once it tries to compile predlib.lsp it gets stuck, top shows no CPU and I got ktrace output from it. zmyrgel:903$ ECLDIR=`pwd`/ ktrace -di ./ecl_min compile ;*** Lisp core booted ECL (Embeddable Common Lisp) ;;; ;;; Welcome to bare.lsp. Let's bring this instance up! ;;; ;;; ;;; About to load lsp/load.lsp ;;; ;;; Loading src:lsp;export.lsp ;;; Loading src:lsp;defmacro.lsp ;;; Loading src:lsp;helpfile.lsp ;;; Loading src:lsp;evalmacros.lsp ;;; Loading src:lsp;cmuutil.lsp ;;; Loading src:lsp;setf.lsp ;;; Loading src:lsp;predlib.lsp --- stops here Here's the tail of kdump: ... 14998 ecl_min RET __thrwakeup 3 14998 ecl_min CALL __thrwakeup(0xcc47ecfe780,0) 14998 ecl_min RET __thrwakeup 3 14998 ecl_min CALL __thrwakeup(0xcc47ecfe780,0) 14998 ecl_min RET __thrwakeup 3 14998 ecl_min CALL sigprocmask(SIG_BLOCK,~0) 14998 ecl_min RET sigprocmask 0 14998 ecl_min CALL mprotect(0xcc3c749,0x2000,0x3PROT_READ|PROT_WRITE) 14998 ecl_min RET mprotect 0 14998 ecl_min CALL mprotect(0xcc3c749,0x2000,0x1PROT_READ) 14998 ecl_min RET mprotect 0 14998 ecl_min CALL sigprocmask(SIG_SETMASK,0) 14998 ecl_min RET sigprocmask ~0x10100SIGKILL|SIGSTOP 14998 ecl_min CALL sigprocmask(SIG_BLOCK,~0) 14998 ecl_min RET sigprocmask 0 14998 ecl_min CALL mprotect(0xcc423ea5000,0x1000,0x3PROT_READ|PROT_WRITE) 14998 ecl_min RET mprotect 0 14998 ecl_min CALL mprotect(0xcc423ea5000,0x1000,0x1PROT_READ) 14998 ecl_min RET mprotect 0 14998 ecl_min CALL sigprocmask(SIG_SETMASK,0) 14998 ecl_min RET sigprocmask ~0x10100SIGKILL|SIGSTOP 14998 ecl_min CALL kill(1032698,SIGXFSZ) 14998 ecl_min RET kill 0 14998 ecl_min CALL __thrsleep(0xcc3e0285314,CLOCK_REALTIME,0,0xcc3e0285310,0xcc423fa5810) So seems the process is sleeping for some reason and not waking up. Currently I don't have ideas how to proceed so any ideas would be welcome. Timo
Bad system call with ECL
Hi, While testing lisp libraries on OpenBSD I noticed ECL package doesn't seem to function anymore. zmyrgel:10171$ sudo pkg_add ecl ecl-13.5.1: ok zmyrgel:10172$ ecl Bad system call (core dumped) zmyrgel:10173$ gdb ecl ecl.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type show copying to see the conditions. There is absolutely no warranty for GDB. Type show warranty for details. This GDB was configured as amd64-unknown-openbsd5.5... Core was generated by `ecl'. Program terminated with signal 12, Bad system call. Reading symbols from /usr/lib/libpthread.so.17.3...done. Loaded symbols for /usr/lib/libpthread.so.17.3 Reading symbols from /usr/lib/libpthread.so.18.0...done. Loaded symbols for /usr/lib/libpthread.so.18.0 Loaded symbols for /home/zmyrgel/bin/ecl Reading symbols from /home/zmyrgel/lib/libecl.so.13.5...done. Loaded symbols for /home/zmyrgel/lib/libecl.so.13.5 Symbols already loaded for /usr/lib/libpthread.so.17.3 Reading symbols from /usr/lib/libm.so.8.0...done. Loaded symbols for /usr/lib/libm.so.8.0 Reading symbols from /usr/lib/libc.so.68.4...done. Loaded symbols for /usr/lib/libc.so.68.4 Reading symbols from /usr/local/lib/libgmp.so.9.0...done. Loaded symbols for /usr/local/lib/libgmp.so.9.0 Reading symbols from /usr/local/lib/libgc.so.4.0...done. Loaded symbols for /usr/local/lib/libgc.so.4.0 Reading symbols from /usr/local/lib/libffi.so.0.0...done. Loaded symbols for /usr/local/lib/libffi.so.0.0 Symbols already loaded for /usr/lib/libpthread.so.18.0 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so #0 0x1398a85437ca in gettimeofday () at stdin:2 2 stdin: No such file or directory. in stdin (gdb) bt #0 0x1398a85437ca in gettimeofday () at stdin:2 #1 0x1398a857e1d2 in time (t=0x0) at /usr/src/lib/libc/gen/time.c:39 #2 0x1398a580db59 in init_random_state () at num_rand.d:94 #3 0x1398a580dc8a in ecl_make_random_state (rs=0x1398a5aeebd0) at num_rand.d:224 #4 0x1398a56ffafc in cl_boot (argc=Variable argc is not available. ) at main.d:692 #5 0x13969c201179 in main (argc=Variable argc is not available. ) at eclinitLPDTiw.c:51 Current language: auto; currently asm (gdb) zmyrgel:10174$ Any idea whats going on? Timo
Re: Bad system call with ECL
On 02/20/14 10:27, Timo Myyrä wrote: Hi, While testing lisp libraries on OpenBSD I noticed ECL package doesn't seem to function anymore. works for me with 14/02 amd64 snapshot, maybe your pkgs are not in sync with base, in -current there is libc.so.73.1, in 5.4 there is libc.so.69 and you have libc.so.68.4 (Loaded symbols for /usr/lib/libc.so.68.4). Cheers Giovanni
Re: Bad system call with ECL
Giovanni Bechis giova...@bigio.snb.it writes: On 02/20/14 10:27, Timo Myyrä wrote: Hi, While testing lisp libraries on OpenBSD I noticed ECL package doesn't seem to function anymore. works for me with 14/02 amd64 snapshot, maybe your pkgs are not in sync with base, in -current there is libc.so.73.1, in 5.4 there is libc.so.69 and you have libc.so.68.4 (Loaded symbols for /usr/lib/libc.so.68.4). Cheers Giovanni Ah, good catch. As usually I skipped the most basic issues and tried to solve wrong problem. The root cause here was old ecl version in my $HOME/bin which I haven't updated in a while. At least this made me delve a bit to ecl code base. Seems that ecl uses poor random implementation and could be patched to use arc4random. Timo
Small fix for ECL Makefile
Hi, Apparently a brainfart got through on last update. ECL doesn't have --enable-threads=pthreads option, it just uses yes|no|auto. This wasn't noticed before as undefined options seem to disable threads anyway. Here's a fix to Makefile to use correct option. Spotted by Vinodh Das. Timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile11 Jun 2013 10:31:35 - 1.20 +++ Makefile19 Jul 2013 14:44:52 - @@ -28,7 +28,7 @@ CONFIGURE_ARGS += --enable-boehm=system \ --enable-libatomic=system \ - --enable-threads=pthreads \ + --enable-threads=no \ --with-system-gmp \ --with-gmp-prefix=${LOCALBASE}
Re: [UPDATE] ecl-13.5.1
Stuart Henderson st...@openbsd.org writes: On 2013/06/09 22:29, Timo Myyrä wrote: Stuart Henderson st...@openbsd.org writes: On 2013/06/09 13:25, Timo Myyrä wrote: Hi, Here's updated version for ECL port. Couldn't figure out how to add new files to the diff so whole port attached. cvs add (this works fine against anoncvs provided it is only for files not directories), then cvs diff -uNp. Differences from previous: - patch man pages for mandoc to skip USE_GROFF - remove USE_GMAKE, seems to work without it - add missing newlines to C templates - don't use FULLPKGNAME in PLIST, it will break when somebody bumps REVISION. the only exception for this is with pkg-readmes. Where does the FULLPKGNAME come from? The PLIST is auto-generated by 'make update-plist'. update-plist isn't perfect, it has problems with substituting certain variables (and also with multi-package ports). Here there are two options. 1. manually s/${FULLPKGNAME}/ecl-${V}/ in the plist or 2. patch the port to install to an alternative location which doesn't include the version number Ah, found the issue. I had libatomic_ops package installed so the port picked it up instead of using its included version of it. The configure script needed '--enable-libatomic=system' to use libatomic_ops from devel/boehm-gc. I also added BUILD_DEPENDS for the libatomic_ops. Ah good :) - is the library symlink really needed? I've removed the symlink. Just looked into this a bit more - the symlink is needed; not sure why yet, but math/maxima build breaks without it. I also removed the MODGNU_CONFIG_GUESS_DIRS, it didn't seem to contribute anything to port. Also added the TEST_TARGET and tests seem to pass. That looks correct to me. The remaining issues seem to be to solve the FULLPKGPATH issue and the SHARED_LIBRARY issue. I believe the library should be listed in PFRAG.shared which currently remains empty. For the shared library: As there's no static library equivalent to this shared lib, I suspect it will fail on our non-shared-library architectures, so it could be marked SHARED_ONLY (roll PFRAG.shared into PLIST). (boehm-gc is not built on vax/m88k anyway, so we won't even attempt to build ecl there, so no loss from adding SHARED_ONLY). (not relevant here, but for reference with other ports: in 5.3+, in cases where you have a shared library and a static library with the same base name (libfoo.so.X.Y and libfoo.a) then you can list everything in PLIST and avoid having a PFRAG.shared - pkg_create knows how to handle this). So, these two issues can be dealt with by adding SHARED_ONLY and removing PFRAG.shared (and the %%shared%% line from PLIST) altogether, and choosing one or other option to handle FULLPKGNAME. One last easily-fixed thing - :doc doesn't work as help.doc isn't installed, so it needs a post-install target with something like the below (and adding to PLIST). ${INSTALL_DATA} ${WRKSRC}/build/help.doc ${PREFIX}/lib/ecl-$V/ Ok, here's a new diff yet again, added SHARED_ONLY = Yes, included help.doc and library symlink. Manually renamed FULLPKGNAME to ecl-${V}. Does this work as intended? Somebody could give sparc build a spin to see if its still broken. Timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.18 diff -u -u -p -r1.18 Makefile --- Makefile1 Jun 2013 14:28:28 - 1.18 +++ Makefile10 Jun 2013 14:52:00 - @@ -5,13 +5,14 @@ CATEGORIES = lang BROKEN-sparc = infinite loop while building -V =11.1.1 +V =13.5.1 DISTNAME = ecl-$V -REVISION= 1 -SHARED_LIBS += ecl 2.0 +SHARED_LIBS += ecl 3.0 +SHARED_ONLY = Yes HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V +EXTRACT_SUFX = .tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes @@ -19,17 +20,18 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} CONFIGURE_STYLE = gnu -USE_GMAKE =Yes -USE_GROFF =Yes -NO_TEST = Yes +TEST_TARGET = check CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ ECLLIB_VERSION=${LIBecl_VERSION} FLAVORS = debug FLAVOR ?= CONFIGURE_ARGS += --enable-boehm=system \ + --enable-libatomic=system \ + --enable-threads=pthreads \ --with-system-gmp \ --with-gmp-prefix=${LOCALBASE} + # etags gets picked up if it's install, and dumps core while # generating the tags. so override it for now untill etags is fixed. CONFIGURE_ENV += ETAGS=/usr/bin/true @@ -38,10 +40,7 @@ CONFIGURE_ENV += ETAGS=/usr/bin/true CONFIGURE_ARGS += --with-debug-cflags=-g .endif -MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST
Re: [UPDATE] ecl-13.5.1
Hi, Here's updated version for ECL port. Couldn't figure out how to add new files to the diff so whole port attached. Differences from previous: - patch man pages for mandoc to skip USE_GROFF - remove USE_GMAKE, seems to work without it - add missing newlines to C templates timo ecl.tar.gz Description: Binary data
Re: [UPDATE] ecl-13.5.1
On 2013/06/09 13:25, Timo Myyrä wrote: Hi, Here's updated version for ECL port. Couldn't figure out how to add new files to the diff so whole port attached. cvs add (this works fine against anoncvs provided it is only for files not directories), then cvs diff -uNp. Differences from previous: - patch man pages for mandoc to skip USE_GROFF - remove USE_GMAKE, seems to work without it - add missing newlines to C templates - don't use FULLPKGNAME in PLIST, it will break when somebody bumps REVISION. the only exception for this is with pkg-readmes. - build needs fixing to work as non-root - currently it uses install to set ownership which fails (don't use install before make fake): mkdir -p '/usr/obj/ports/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc' install -c -o root -g bin -m 444 /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/avr32.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/mips.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/! gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h '/usr/obj/ports/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc' install: /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc/alpha.h: chown/chgrp: Operation not permitted (and, is it legit to use these headers from the bundled copy of gc when it's building against the installed gc?) - manpage patches seem over the top; no need to appease -Tlint, just fix up things which result in broken formatting - fixes for whitespace at eol just increase chance of conflicts when updating, there's no problem with actual formatting. date fixes probably also not needed and definitely increase chance of conflicts when updating. - is the library symlink really needed?
Re: [UPDATE] ecl-13.5.1
Stuart Henderson st...@openbsd.org writes: On 2013/06/09 13:25, Timo Myyrä wrote: Hi, Here's updated version for ECL port. Couldn't figure out how to add new files to the diff so whole port attached. cvs add (this works fine against anoncvs provided it is only for files not directories), then cvs diff -uNp. Differences from previous: - patch man pages for mandoc to skip USE_GROFF - remove USE_GMAKE, seems to work without it - add missing newlines to C templates - don't use FULLPKGNAME in PLIST, it will break when somebody bumps REVISION. the only exception for this is with pkg-readmes. Where does the FULLPKGNAME come from? The PLIST is auto-generated by 'make update-plist'. - build needs fixing to work as non-root - currently it uses install to set ownership which fails (don't use install before make fake): mkdir -p '/usr/obj/ports/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc' install -c -o root -g bin -m 444 /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/avr32.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/mips.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/! gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc' install: /usr/obj/ports/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc/alpha.h: chown/chgrp: Operation not permitted (and, is it legit to use these headers from the bundled copy of gc when it's building against the installed gc?) Ah, found the issue. I had libatomic_ops package installed so the port picked it up instead of using its included version of it. The configure script needed '--enable-libatomic=system' to use libatomic_ops from devel/boehm-gc. I also added BUILD_DEPENDS for the libatomic_ops. - manpage patches seem over the top; no need to appease -Tlint, just fix up things which result in broken formatting - fixes for whitespace at eol just increase chance of conflicts when updating, there's no problem with actual formatting. date fixes probably also not needed and definitely increase chance of conflicts when updating. Ok, I've sent the full man page diff's to upstream and left just the necessary lines fixing errors. - is the library symlink really needed? I've removed the symlink. I also removed the MODGNU_CONFIG_GUESS_DIRS, it didn't seem to contribute anything to port. Also added the TEST_TARGET and tests seem to pass. The remaining issues seem to be to solve the FULLPKGPATH issue and the SHARED_LIBRARY issue. I believe the library should be listed in PFRAG.shared which currently remains empty. Timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.18 diff -u -u -p -r1.18 Makefile --- Makefile1 Jun 2013 14:28:28 - 1.18 +++ Makefile9 Jun 2013 19:04:55 - @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.18 2013/06/01 14:28:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2012/03/30 09:06:34 phessler Exp $ -COMMENT = embeddable common-lisp +COMMENT = embeddable common lisp CATEGORIES = lang BROKEN-sparc = infinite loop while building -V =11.1.1 +V =13.5.1 DISTNAME = ecl-$V -REVISION= 1 -SHARED_LIBS += ecl 2.0 +SHARED_LIBS += ecl 3.0 HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V +EXTRACT_SUFX = .tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes @@ -19,17 +19,18 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} CONFIGURE_STYLE = gnu -USE_GMAKE =Yes -USE_GROFF =Yes -NO_TEST = Yes +TEST_TARGET = check CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE
Re: [UPDATE] ecl-13.5.1
On 2013/06/09 22:29, Timo Myyrä wrote: Stuart Henderson st...@openbsd.org writes: On 2013/06/09 13:25, Timo Myyrä wrote: Hi, Here's updated version for ECL port. Couldn't figure out how to add new files to the diff so whole port attached. cvs add (this works fine against anoncvs provided it is only for files not directories), then cvs diff -uNp. Differences from previous: - patch man pages for mandoc to skip USE_GROFF - remove USE_GMAKE, seems to work without it - add missing newlines to C templates - don't use FULLPKGNAME in PLIST, it will break when somebody bumps REVISION. the only exception for this is with pkg-readmes. Where does the FULLPKGNAME come from? The PLIST is auto-generated by 'make update-plist'. update-plist isn't perfect, it has problems with substituting certain variables (and also with multi-package ports). Here there are two options. 1. manually s/${FULLPKGNAME}/ecl-${V}/ in the plist or 2. patch the port to install to an alternative location which doesn't include the version number Ah, found the issue. I had libatomic_ops package installed so the port picked it up instead of using its included version of it. The configure script needed '--enable-libatomic=system' to use libatomic_ops from devel/boehm-gc. I also added BUILD_DEPENDS for the libatomic_ops. Ah good :) - is the library symlink really needed? I've removed the symlink. Just looked into this a bit more - the symlink is needed; not sure why yet, but math/maxima build breaks without it. I also removed the MODGNU_CONFIG_GUESS_DIRS, it didn't seem to contribute anything to port. Also added the TEST_TARGET and tests seem to pass. That looks correct to me. The remaining issues seem to be to solve the FULLPKGPATH issue and the SHARED_LIBRARY issue. I believe the library should be listed in PFRAG.shared which currently remains empty. For the shared library: As there's no static library equivalent to this shared lib, I suspect it will fail on our non-shared-library architectures, so it could be marked SHARED_ONLY (roll PFRAG.shared into PLIST). (boehm-gc is not built on vax/m88k anyway, so we won't even attempt to build ecl there, so no loss from adding SHARED_ONLY). (not relevant here, but for reference with other ports: in 5.3+, in cases where you have a shared library and a static library with the same base name (libfoo.so.X.Y and libfoo.a) then you can list everything in PLIST and avoid having a PFRAG.shared - pkg_create knows how to handle this). So, these two issues can be dealt with by adding SHARED_ONLY and removing PFRAG.shared (and the %%shared%% line from PLIST) altogether, and choosing one or other option to handle FULLPKGNAME. One last easily-fixed thing - :doc doesn't work as help.doc isn't installed, so it needs a post-install target with something like the below (and adding to PLIST). ${INSTALL_DATA} ${WRKSRC}/build/help.doc ${PREFIX}/lib/ecl-$V/
Re: [UPDATE] ecl-13.5.1
Hi, I am keen for this update, as it may fix the regression tests for math/maxima. On Thu, Jun 06, 2013 at 09:09:16PM +0300, Timo Myyrä wrote: Hi, Here's a patch to bring ECL to latest version with pthreads enabled. I've removed the etags part from Makefile, don't know if it is still relevant. First, I had to manually merge the diff. Perhaps you were not up to date? After merging: ---8--- install -c -o root -g bin -m 444 /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/avr32.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/mips.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h /usr/ports/pobj/ecl-13.5.1/ecl-1! 3.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h '/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc' install: /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc/alpha.h: chown/chgrp: Operation not permitted gmake[6]: *** [install-nobase_sysdepHEADERS] Error 71 gmake[6]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src/atomic_ops/sysdeps' gmake[5]: *** [install-am] Error 2 gmake[5]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src/atomic_ops/sysdeps' gmake[4]: *** [install-recursive] Error 1 gmake[4]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src/atomic_ops' gmake[3]: *** [install-recursive] Error 1 gmake[3]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src' gmake[2]: *** [install-recursive] Error 1 gmake[2]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic' gmake[1]: *** [libeclatomic.a] Error 2 gmake[1]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build' gmake: *** [all] Error 2 ---8--- Perhaps you were building as root? Try building as a normal user as per the faq. AFAIK, in general, 'make build' should not be runnning install(1). -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: [UPDATE] ecl-13.5.1
Edd Barrett vex...@gmail.com writes: Hi, I am keen for this update, as it may fix the regression tests for math/maxima. On Thu, Jun 06, 2013 at 09:09:16PM +0300, Timo Myyrä wrote: Hi, Here's a patch to bring ECL to latest version with pthreads enabled. I've removed the etags part from Makefile, don't know if it is still relevant. First, I had to manually merge the diff. Perhaps you were not up to date? After merging: ---8--- install -c -o root -g bin -m 444 /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/alpha.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/arm.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/avr32.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/cris.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/hppa.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/ia64.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/m68k.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/mips.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/powerpc.h /usr/ports/pobj/ecl-13.5.1/ecl-1! 3.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/s390.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sh.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/src/gc-unstable/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc' install: /usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/ecl/atomic_ops/sysdeps/gcc/alpha.h: chown/chgrp: Operation not permitted gmake[6]: *** [install-nobase_sysdepHEADERS] Error 71 gmake[6]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src/atomic_ops/sysdeps' gmake[5]: *** [install-am] Error 2 gmake[5]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src/atomic_ops/sysdeps' gmake[4]: *** [install-recursive] Error 1 gmake[4]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src/atomic_ops' gmake[3]: *** [install-recursive] Error 1 gmake[3]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic/src' gmake[2]: *** [install-recursive] Error 1 gmake[2]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build/atomic' gmake[1]: *** [libeclatomic.a] Error 2 gmake[1]: Leaving directory `/usr/ports/pobj/ecl-13.5.1/ecl-13.5.1/build' gmake: *** [all] Error 2 ---8--- Perhaps you were building as root? Try building as a normal user as per the faq. AFAIK, in general, 'make build' should not be runnning install(1). Here's an updated diff. Hopefully better than the last one. I've added patch to exclude build-stamp, help.doc and TAGS from installation. They didn't seem to contribute anything to the port. I also returned the TAGS handling to Makefile. The build works for me without root on amd64. One thing I noticed was excessive warnings when compiling libraries with quicklisp: /tmp/eclinitJ01vbM.c:52:2: warning: no newline at end of file /tmp/eclinitZq9PmO.c:52:2: warning: no newline at end of file ... Seems that the ecl generates some temp files which doesn't include the newline causing gcc to emit warnings. Haven't been able to pin point the file generation yet. timo Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile1 Jun 2013 14:28:28 - 1.18 +++ Makefile7 Jun 2013 13:36:10 - @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.18 2013/06/01 14:28:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2012/03/30 09:06:34 phessler Exp $ COMMENT = embeddable common-lisp CATEGORIES = lang BROKEN-sparc = infinite loop while building -V =11.1.1 +V =13.5.1 DISTNAME = ecl-$V -REVISION= 1 -SHARED_LIBS += ecl 2.0 +SHARED_LIBS += ecl 3.0 HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V +EXTRACT_SUFX = .tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes @@ -29,7 +29,8 @@ CONFIGURE_ARGS += --enable-boehm=system \ --with-system-gmp \ - --with-gmp-prefix=${LOCALBASE} + --with-gmp-prefix=${LOCALBASE} \ + --enable-threads=pthreads # etags gets picked up if it's install, and dumps core while # generating the tags. so
[UPDATE] ecl-13.5.1
Hi, Here's a patch to bring ECL to latest version with pthreads enabled. I've removed the etags part from Makefile, don't know if it is still relevant. Timo diff -wur /usr/ports/lang/ecl/Makefile ./Makefile --- /usr/ports/lang/ecl/MakefileSun Jun 2 20:16:27 2013 +++ ./Makefile Thu Jun 6 20:50:02 2013 @@ -1,17 +1,17 @@ -# $OpenBSD: Makefile,v 1.18 2013/06/01 14:28:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2012/03/30 09:06:34 phessler Exp $ COMMENT = embeddable common-lisp CATEGORIES = lang BROKEN-sparc = infinite loop while building -V =11.1.1 +V =13.5.1 DISTNAME = ecl-$V -REVISION= 1 -SHARED_LIBS += ecl 2.0 +SHARED_LIBS += ecl 3.0 HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V +EXTRACT_SUFX = .tgz # GPLv2 or later PERMIT_PACKAGE_CDROM = Yes @@ -29,10 +29,8 @@ CONFIGURE_ARGS += --enable-boehm=system \ --with-system-gmp \ - --with-gmp-prefix=${LOCALBASE} -# etags gets picked up if it's install, and dumps core while -# generating the tags. so override it for now untill etags is fixed. -CONFIGURE_ENV += ETAGS=/usr/bin/true + --with-gmp-prefix=${LOCALBASE} \ + --enable-threads=pthreads .if ${FLAVOR:Mdebug} CONFIGURE_ARGS += --with-debug-cflags=-g diff -wur /usr/ports/lang/ecl/distinfo ./distinfo --- /usr/ports/lang/ecl/distinfoWed Apr 20 18:45:16 2011 +++ ./distinfo Mon Jun 3 22:29:31 2013 @@ -1,5 +1,2 @@ -MD5 (ecl-11.1.1.tar.gz) = aWPPoA4cbUohI/1iEAsC5g== -RMD160 (ecl-11.1.1.tar.gz) = 4V3YzwLNateO81KT3wFDY2Ff1K0= -SHA1 (ecl-11.1.1.tar.gz) = nEyIaD9hhvgVKGYDPmhQ4Z64zB8= -SHA256 (ecl-11.1.1.tar.gz) = KKzOh04mSp5xgqJCS7eho/fYNKjy4TRuwO9xVtTtOwc= -SIZE (ecl-11.1.1.tar.gz) = 5898523 +SHA256 (ecl-13.5.1.tgz) = +RxXzgZf6XSLyBBOGR5LLc/oVNY0MV/ngA3QphNHLKI= +SIZE (ecl-13.5.1.tgz) = 9401163 Only in .: ecl.diff Only in /usr/ports/lang/ecl/patches: CVS diff -wur /usr/ports/lang/ecl/patches/patch-src_Makefile_in ./patches/patch-src_Makefile_in --- /usr/ports/lang/ecl/patches/patch-src_Makefile_in Wed Apr 20 18:45:16 2011 +++ ./patches/patch-src_Makefile_in Thu Jun 6 20:30:10 2013 @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_Makefile_in,v 1.3 2011/04/20 15:45:16 shadchin Exp $ src/Makefile.in.orig Mon Jan 17 02:39:56 2011 -+++ src/Makefile.inMon Apr 18 21:29:30 2011 -@@ -165,6 +165,7 @@ install: +$OpenBSD$ +--- src/Makefile.in.orig Thu Jun 6 20:28:57 2013 src/Makefile.inThu Jun 6 20:30:04 2013 +@@ -170,6 +170,7 @@ install: for i in build-stamp help.doc TAGS ; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ done @@ -9,7 +9,7 @@ for i in $(LSP_LIBRARIES) $(LIBRARIES); do \ if test -s $$i ; then \ if echo $$i | grep dll; then \ -@@ -173,13 +174,7 @@ install: +@@ -178,13 +179,7 @@ install: $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ fi \ done diff -wur /usr/ports/lang/ecl/patches/patch-src_compile_lsp_in ./patches/patch-src_compile_lsp_in --- /usr/ports/lang/ecl/patches/patch-src_compile_lsp_inMon Mar 16 13:19:12 2009 +++ ./patches/patch-src_compile_lsp_in Sun Jun 2 23:04:47 2013 @@ -1,38 +1,29 @@ $OpenBSD: patch-src_compile_lsp_in,v 1.1 2009/03/16 11:19:12 espie Exp $ src/compile.lsp.in.origMon Mar 16 10:45:42 2009 -+++ src/compile.lsp.in Mon Mar 16 10:50:38 2009 -@@ -48,19 +48,19 @@ - @LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @LIBS@ @FASL_LIBS@) +--- src/compile.lsp.in.origSun Jun 2 23:00:02 2013 src/compile.lsp.in Sun Jun 2 23:04:32 2013 +@@ -71,19 +71,19 @@ + @LDFLAGS@ @LIBPREFIX@ecl.@LIBEXT@ @CORE_LIBS@ @FASL_LIBS@ @LIBS@) #+(and :wants-dlopen (not nonstop)) (setf c::*ld-flags* - @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ + @LDFLAGS@ -L. -lecl @LIBS@ c::*ld-shared-flags* -- @SHARED_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@ +- @SHARED_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @FASL_LIBS@ @LIBS@ + @SHARED_LDFLAGS@ @LDFLAGS@ -L. -lecl @LIBS@ @FASL_LIBS@ c::*ld-bundle-flags* -- @BUNDLE_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@) -+ @BUNDLE_LDFLAGS@ @LDFLAGS@ -L. -lecl @LIBS@ @FASL_LIBS@) +- @BUNDLE_LDFLAGS@ @LDFLAGS@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @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* - @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ + @LDFLAGS@ -Wld=-L.,-lecl @LIBS@ c::*ld-shared-flags* -- @SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @LIBS@ @FASL_LIBS@ +- @SHARED_LDFLAGS@ @LDFLAGS@ -Wld=-l@SHAREDPREFIX@ecl.@SHAREDEXT@ @FASL_LIBS@ @LIBS@ + @SHARED_LDFLAGS@ @LDFLAGS
Re: UPDATE: lang/ecl
On Tue, Apr 19, 2011 at 02:01:02AM +0600, Alexandr Shadchin wrote: Hi, This update package ecl to the latest release 11.1.1. Tested on amd64 and maxima (no regress). Anyone try build on hppa ? Comments ? OK ? it builds and runs fine on hppa :) Landry
Re: UPDATE: lang/ecl
On Tue, Apr 19, 2011 at 09:46:37AM +0200, Landry Breuil wrote: On Tue, Apr 19, 2011 at 02:01:02AM +0600, Alexandr Shadchin wrote: Hi, This update package ecl to the latest release 11.1.1. Tested on amd64 and maxima (no regress). Anyone try build on hppa ? Comments ? OK ? it builds and runs fine on hppa :) Landry Works fine on sparc64 (maxima builds + passes regress tests). Ok with me. -- Cheers, Jasper Capable, generous men do not create victims, they nurture them.
UPDATE: lang/ecl
Hi, This update package ecl to the latest release 11.1.1. Tested on amd64 and maxima (no regress). Anyone try build on hppa ? Comments ? OK ? -- Alexandr Shadchin Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile4 Dec 2010 14:36:19 - 1.10 +++ Makefile18 Apr 2011 19:25:59 - @@ -5,9 +5,9 @@ CATEGORIES =lang BROKEN-hppa = infinite loop during build -V =10.4.1 +V =11.1.1 DISTNAME = ecl-$V -SHARED_LIBS += ecl 1.0 +SHARED_LIBS += ecl 2.0 HOMEPAGE = http://ecls.sourceforge.net/ SUBST_VARS = V @@ -25,9 +25,7 @@ USE_GMAKE = Yes USE_LIBTOOL = Yes USE_GROFF =Yes NO_REGRESS = Yes -CONFIGURE_ENV += LDFLAGS='-pthread -L${LOCALBASE}/lib' \ - CPPFLAGS=-I${LOCALBASE}/include \ - CFLAGS='${CFLAGS} -pthread' \ +CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \ ECLLIB_VERSION=${LIBecl_VERSION} FLAVORS = debug FLAVOR ?= @@ -46,8 +44,9 @@ MODGNU_CONFIG_GUESS_DIRS =${WRKDIST} \ ${WRKDIST}/src/gmp LIB_DEPENDS += devel/gmp \ - devel/boehm-gc - -WANTLIB += c gc gmp m pthread + devel/boehm-gc \ + devel/libffi + +WANTLIB += c ffi gc gmp m pthread .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo4 Dec 2010 14:36:19 - 1.4 +++ distinfo18 Apr 2011 19:25:59 - @@ -1,5 +1,5 @@ -MD5 (ecl-10.4.1.tar.gz) = vlP15Vo/B8fPtftc2aKj8A== -RMD160 (ecl-10.4.1.tar.gz) = jjn19Npt2HKrPsBGaeVyFYCXMd0= -SHA1 (ecl-10.4.1.tar.gz) = BExXm38MQtFeBbZixDNIjo2oUCA= -SHA256 (ecl-10.4.1.tar.gz) = UF3P6PJqyjUicSJa1afxF7m+8Pbn96err3t/EffGPGw= -SIZE (ecl-10.4.1.tar.gz) = 5835953 +MD5 (ecl-11.1.1.tar.gz) = aWPPoA4cbUohI/1iEAsC5g== +RMD160 (ecl-11.1.1.tar.gz) = 4V3YzwLNateO81KT3wFDY2Ff1K0= +SHA1 (ecl-11.1.1.tar.gz) = nEyIaD9hhvgVKGYDPmhQ4Z64zB8= +SHA256 (ecl-11.1.1.tar.gz) = KKzOh04mSp5xgqJCS7eho/fYNKjy4TRuwO9xVtTtOwc= +SIZE (ecl-11.1.1.tar.gz) = 5898523 Index: patches/patch-src_Makefile_in === RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_Makefile_in --- patches/patch-src_Makefile_in 4 Dec 2010 14:36:19 - 1.2 +++ patches/patch-src_Makefile_in 18 Apr 2011 19:25:59 - @@ -1,26 +1,26 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2010/12/04 14:36:19 espie Exp $ src/Makefile.in.orig Sun Apr 4 16:31:27 2010 -+++ src/Makefile.inSun Nov 28 20:14:34 2010 -@@ -152,6 +152,7 @@ install: - for i in BUILD-STAMP help.doc TAGS ; do \ +--- src/Makefile.in.orig Mon Jan 17 02:39:56 2011 src/Makefile.inMon Apr 18 21:29:30 2011 +@@ -165,6 +165,7 @@ install: + for i in build-stamp help.doc TAGS ; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ done + cp libecl.so $(LSP_LIBRARIES) for i in $(LSP_LIBRARIES) $(LIBRARIES); do \ if test -s $$i ; then \ if echo $$i | grep dll; then \ -@@ -160,13 +161,7 @@ install: +@@ -173,13 +174,7 @@ install: $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ fi \ done - if [ x@SONAME@ != x -a -f @SONAME@ ]; then \ --( cd $(DESTDIR)$(libdir) rm -f @SONAME3@ @SONAME2@ @SONAME1@ \ +-( cd $(DESTDIR)$(libdir) $(RM) -f @SONAME3@ @SONAME2@ @SONAME1@ \ - mv @SONAME@ @SONAME3@ \ - $(LN_S) @SONAME3@ @SONAME2@ \ - $(LN_S) @SONAME3@ @SONAME1@ \ - $(LN_S) @SONAME3@ @SONAME@ ) \ - fi + cd $(DESTDIR)$(libdir) ln -sf $(LSP_LIBRARIES) libecl.so - for i in c/dpp$(EXE) ecl_min$(EXE) `cat MODULES`; do \ - case $$i in \ - *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ + $(INSTALL_PROGRAM) c/dpp$(EXE) $(DESTDIR)$(ecldir) + $(INSTALL_PROGRAM) ecl_min$(EXE) $(DESTDIR)$(ecldir) + for i in `cat modules`; do \ Index: patches/patch-src_c_print_d === RCS file: patches/patch-src_c_print_d diff -N patches/patch-src_c_print_d --- patches/patch-src_c_print_d 30 Nov 2010 11:23:39 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_c_print_d,v 1.1 2010/11/30 11:23:39 espie Exp $ src/c/print.d.orig Wed Dec 17 16:41:52 2008 -+++ src/c/print.d Tue Nov 30 12:10:43 2010 -@@ -597,7 +597,7 @@ write_double(DBL_TYPE d, int e, int n, cl_object strea - } - write_str(buff+1, stream); - } else { -- char buff
Re: Small rework lang/ecl
Second attempt :) On Sat, Dec 04, 2010 at 08:53:16PM +0500, Alexandr Shadchin wrote: 1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode remove CONFIGURE_ARGS += --enable-unicode because add two regress in math/maxima (rtest8: 125, 126) 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so returned symlink lib/libecl.so plus 5) remove create lib/{Copyright, LGPL} (or better to be moved to share/ecl ?) 6) fix two regress math/maxima (rtest16: 382, 383) based on the commit http://ecls.git.sourceforge.net/git/gitweb.cgi?p=ecls/ecl;a=commit;h=ed8dbe4c139f3428abbbda962d9bd243ab5eb777 Tested on amd64. -- Alexandr Shadchin Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile4 Dec 2010 14:36:19 - 1.10 +++ Makefile7 Dec 2010 16:41:17 - @@ -1,53 +1,52 @@ # $OpenBSD: Makefile,v 1.10 2010/12/04 14:36:19 espie Exp $ -COMMENT = embeddable common-lisp -CATEGORIES = lang +COMMENT = embeddable common-lisp +BROKEN-hppa = infinite loop during build -BROKEN-hppa = infinite loop during build +V =10.4.1 +DISTNAME = ecl-$V +REVISION = 0 +SHARED_LIBS = ecl 1.0 -V =10.4.1 -DISTNAME = ecl-$V -SHARED_LIBS += ecl 1.0 +CATEGORIES = lang -HOMEPAGE = http://ecls.sourceforge.net/ -SUBST_VARS = V +HOMEPAGE = http://ecls.sourceforge.net/ -# GPLv2 or later -PERMIT_PACKAGE_CDROM = Yes +# LGPLv2 +PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} -CONFIGURE_STYLE = gnu -USE_GMAKE =Yes -USE_LIBTOOL = Yes +WANTLIB = c gc gmp m pthread + +LIB_DEPENDS = devel/boehm-gc \ + devel/gmp + +SUBST_VARS = V + +USE_GMAKE =Yes USE_GROFF =Yes -NO_REGRESS = Yes -CONFIGURE_ENV += LDFLAGS='-pthread -L${LOCALBASE}/lib' \ - CPPFLAGS=-I${LOCALBASE}/include \ - CFLAGS='${CFLAGS} -pthread' \ - ECLLIB_VERSION=${LIBecl_VERSION} + +NO_REGRESS = Yes + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = --enable-boehm=system \ + --with-system-gmp +CONFIGURE_ENV =ECLLIB_VERSION=${LIBecl_VERSION} \ + CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib + +MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ + ${WRKDIST}/src + FLAVORS = debug FLAVOR ?= -CONFIGURE_ARGS += --enable-boehm=system \ - --with-system-gmp \ - --with-gmp-prefix=${LOCALBASE} \ - .if ${FLAVOR:L:Mdebug} CONFIGURE_ARGS += --with-debug-cflags=-g .endif - -MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ - ${WRKDIST}/src \ - ${WRKDIST}/src/gc \ - ${WRKDIST}/src/gmp - -LIB_DEPENDS += devel/gmp \ - devel/boehm-gc - -WANTLIB += c gc gmp m pthread .include bsd.port.mk Index: patches/patch-src_Makefile_in === RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_Makefile_in --- patches/patch-src_Makefile_in 4 Dec 2010 14:36:19 - 1.2 +++ patches/patch-src_Makefile_in 7 Dec 2010 16:41:17 - @@ -1,6 +1,6 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2010/12/04 14:36:19 espie Exp $ src/Makefile.in.orig Sun Apr 4 16:31:27 2010 -+++ src/Makefile.inSun Nov 28 20:14:34 2010 +--- src/Makefile.in.orig Sun Apr 4 20:31:27 2010 src/Makefile.inSun Dec 5 15:28:33 2010 @@ -152,6 +152,7 @@ install: for i in BUILD-STAMP help.doc TAGS ; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ @@ -9,7 +9,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20 for i in $(LSP_LIBRARIES) $(LIBRARIES); do \ if test -s $$i ; then \ if echo $$i | grep dll; then \ -@@ -160,13 +161,7 @@ install: +@@ -160,25 +161,16 @@ install: $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ fi \ done @@ -24,3 +24,17 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20 for i in c/dpp$(EXE) ecl_min$(EXE) `cat MODULES`; do \ case $$i in \ *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ + *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ + esac \ + done +- for i in Copyright LGPL; do
Small rework lang/ecl
1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so -- Alexandr Shadchin Index: Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile4 Dec 2010 14:36:19 - 1.10 +++ Makefile4 Dec 2010 15:37:41 - @@ -1,53 +1,53 @@ # $OpenBSD: Makefile,v 1.10 2010/12/04 14:36:19 espie Exp $ -COMMENT = embeddable common-lisp -CATEGORIES = lang +COMMENT = embeddable common-lisp +BROKEN-hppa = infinite loop during build -BROKEN-hppa = infinite loop during build +V =10.4.1 +DISTNAME = ecl-$V +SHARED_LIBS = ecl 0.1 -V =10.4.1 -DISTNAME = ecl-$V -SHARED_LIBS += ecl 1.0 +CATEGORIES = lang -HOMEPAGE = http://ecls.sourceforge.net/ -SUBST_VARS = V +HOMEPAGE = http://ecls.sourceforge.net/ -# GPLv2 or later -PERMIT_PACKAGE_CDROM = Yes +# LGPLv2 +PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} -CONFIGURE_STYLE = gnu -USE_GMAKE =Yes -USE_LIBTOOL = Yes +WANTLIB = c gc gmp m pthread + +LIB_DEPENDS = devel/boehm-gc \ + devel/gmp + +SUBST_VARS = V + +USE_GMAKE =Yes USE_GROFF =Yes -NO_REGRESS = Yes -CONFIGURE_ENV += LDFLAGS='-pthread -L${LOCALBASE}/lib' \ + +NO_REGRESS = Yes + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ + --enable-boehm=system \ + --enable-unicode \ + --with-system-gmp +CONFIGURE_ENV =ECLLIB_VERSION=${LIBecl_VERSION} \ CPPFLAGS=-I${LOCALBASE}/include \ - CFLAGS='${CFLAGS} -pthread' \ - ECLLIB_VERSION=${LIBecl_VERSION} + LDFLAGS=-L${LOCALBASE}/lib + +MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ + ${WRKDIST}/src + FLAVORS = debug FLAVOR ?= -CONFIGURE_ARGS += --enable-boehm=system \ - --with-system-gmp \ - --with-gmp-prefix=${LOCALBASE} \ - .if ${FLAVOR:L:Mdebug} CONFIGURE_ARGS += --with-debug-cflags=-g .endif - -MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ - ${WRKDIST}/src \ - ${WRKDIST}/src/gc \ - ${WRKDIST}/src/gmp - -LIB_DEPENDS += devel/gmp \ - devel/boehm-gc - -WANTLIB += c gc gmp m pthread .include bsd.port.mk Index: patches/patch-src_Makefile_in === RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_Makefile_in --- patches/patch-src_Makefile_in 4 Dec 2010 14:36:19 - 1.2 +++ patches/patch-src_Makefile_in 4 Dec 2010 15:37:41 - @@ -1,6 +1,6 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2010/12/04 14:36:19 espie Exp $ src/Makefile.in.orig Sun Apr 4 16:31:27 2010 -+++ src/Makefile.inSun Nov 28 20:14:34 2010 +--- src/Makefile.in.orig Sun Apr 4 20:31:27 2010 src/Makefile.inWed Jul 28 23:42:45 2010 @@ -152,6 +152,7 @@ install: for i in BUILD-STAMP help.doc TAGS ; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ @@ -9,7 +9,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20 for i in $(LSP_LIBRARIES) $(LIBRARIES); do \ if test -s $$i ; then \ if echo $$i | grep dll; then \ -@@ -160,13 +161,7 @@ install: +@@ -160,25 +161,15 @@ install: $(INSTALL_LIBRARY) $$i $(DESTDIR)$(libdir); \ fi \ done @@ -20,7 +20,20 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20 - $(LN_S) @SONAME3@ @SONAME1@ \ - $(LN_S) @SONAME3@ @SONAME@ ) \ - fi -+ cd $(DESTDIR)$(libdir) ln -sf $(LSP_LIBRARIES) libecl.so for i in c/dpp$(EXE) ecl_min$(EXE) `cat MODULES`; do \ case $$i in \ *.fas) $(INSTALL_PROGRAM) $$i $(DESTDIR)$(ecldir);; \ + *) $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir);; \ + esac \ + done +- for i in Copyright LGPL; do \ +-$(INSTALL_DATA) $(top_srcdir)/../$$i $(DESTDIR)$(libdir); \ +- done + $(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext) +- for i in doc/ecl.man doc/ecl-config.man; do \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext); \ ++ for i in ecl ecl-config; do \ ++ $(INSTALL_DATA) doc/$$i.man
Re: Small rework lang/ecl
On Sat, Dec 04, 2010 at 08:53:16PM +0500, Alexandr Shadchin wrote: 1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so -- Alexandr Shadchin Marc is currently working on an update for ecl, so you may want to check after his update what's still relevant of this diff. -- Cheers, Jasper During times of universal deceit, telling the truth becomes a revolutionary act.
Re: Small rework lang/ecl
On Sat, Dec 04, 2010 at 09:14:52PM +0500, Alexandr Shadchin wrote: On Sat, Dec 04, 2010 at 05:05:59PM +0100, Jasper Lievisse Adriaanse wrote: On Sat, Dec 04, 2010 at 08:53:16PM +0500, Alexandr Shadchin wrote: 1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so -- Alexandr Shadchin Marc is currently working on an update for ecl, so you may want to check after his update what's still relevant of this diff. -- Cheers, Jasper During times of universal deceit, telling the truth becomes a revolutionary act. This is a diff on ecl after updating to 10.4.1 (Marc commit today) Explain to me why the libecl.so symlink is no longer necessary.
Re: Small rework lang/ecl
On Sat, Dec 04, 2010 at 05:51:23PM +0100, Marc Espie wrote: On Sat, Dec 04, 2010 at 09:14:52PM +0500, Alexandr Shadchin wrote: On Sat, Dec 04, 2010 at 05:05:59PM +0100, Jasper Lievisse Adriaanse wrote: On Sat, Dec 04, 2010 at 08:53:16PM +0500, Alexandr Shadchin wrote: 1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so -- Alexandr Shadchin Marc is currently working on an update for ecl, so you may want to check after his update what's still relevant of this diff. -- Cheers, Jasper During times of universal deceit, telling the truth becomes a revolutionary act. This is a diff on ecl after updating to 10.4.1 (Marc commit today) Explain to me why the libecl.so symlink is no longer necessary. I understand the meaning of creating a symlink is in the following cases: 1) Library is located in a subfolder 2) Library has a different name with libecl it does not make sense -- Alexandr Shadchin
Re: Small rework lang/ecl
On Sat, Dec 04, 2010 at 10:29:59PM +0500, Alexandr Shadchin wrote: On Sat, Dec 04, 2010 at 05:51:23PM +0100, Marc Espie wrote: On Sat, Dec 04, 2010 at 09:14:52PM +0500, Alexandr Shadchin wrote: On Sat, Dec 04, 2010 at 05:05:59PM +0100, Jasper Lievisse Adriaanse wrote: On Sat, Dec 04, 2010 at 08:53:16PM +0500, Alexandr Shadchin wrote: 1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so -- Alexandr Shadchin Marc is currently working on an update for ecl, so you may want to check after his update what's still relevant of this diff. -- Cheers, Jasper During times of universal deceit, telling the truth becomes a revolutionary act. This is a diff on ecl after updating to 10.4.1 (Marc commit today) Explain to me why the libecl.so symlink is no longer necessary. I understand the meaning of creating a symlink is in the following cases: 1) Library is located in a subfolder 2) Library has a different name with libecl it does not make sense That's not an explanation. Did you try to use it ?
Re: Small rework lang/ecl
On Sat, Dec 04, 2010 at 06:51:28PM +0100, Marc Espie wrote: On Sat, Dec 04, 2010 at 10:29:59PM +0500, Alexandr Shadchin wrote: On Sat, Dec 04, 2010 at 05:51:23PM +0100, Marc Espie wrote: On Sat, Dec 04, 2010 at 09:14:52PM +0500, Alexandr Shadchin wrote: On Sat, Dec 04, 2010 at 05:05:59PM +0100, Jasper Lievisse Adriaanse wrote: On Sat, Dec 04, 2010 at 08:53:16PM +0500, Alexandr Shadchin wrote: 1) reorder, cleanup and aligned in Makefile 2) add CONFIGURE_ARGS += --enable-unicode 3) fix replacement of ecl-config.1 on ecl.1 4) remove create symlinks lib/libecl.so -- Alexandr Shadchin Marc is currently working on an update for ecl, so you may want to check after his update what's still relevant of this diff. -- Cheers, Jasper During times of universal deceit, telling the truth becomes a revolutionary act. This is a diff on ecl after updating to 10.4.1 (Marc commit today) Explain to me why the libecl.so symlink is no longer necessary. I understand the meaning of creating a symlink is in the following cases: 1) Library is located in a subfolder 2) Library has a different name with libecl it does not make sense That's not an explanation. Did you try to use it ? Yes. Also checked on the math/maxima. I do not see any reason to create a symlink, as without it everything is working fine. but this IMHO, I do not insist on its removal. if you need it for some reason, it can leave. -- Alexandr Shadchin
Re: UPDATE: lang/ecl
small update -- Alexandr Shadchin Index: ecl/Makefile === RCS file: /cvs/ports/lang/ecl/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- ecl/Makefile16 Mar 2009 11:19:12 - 1.3 +++ ecl/Makefile7 Jan 2010 21:11:06 - @@ -1,50 +1,48 @@ # $OpenBSD: Makefile,v 1.3 2009/03/16 11:19:12 espie Exp $ -COMMENT = embeddable common-lisp -CATEGORIES = lang +COMMENT = embeddable common-lisp -V =8.12.0 -DISTNAME = ecl-$V -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} -HOMEPAGE = http://ecls.sourceforge.net/ -SUBST_VARS = V +V =9.12.3 +DISTNAME = ecl-${V} +SHARED_LIBS += ecl 0.1 + +CATEGORIES = lang + +HOMEPAGE = http://ecls.sourceforge.net/ # GPLv2 or later -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes -PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM =Yes +PERMIT_DISTFILES_FTP = Yes + +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ecls/} +EXTRACT_SUFX = .tgz + +WANTLIB += c m pthread + +LIB_DEPENDS += gmp::devel/gmp \ + gc::devel/boehm-gc +SUBST_VARS = V -SHARED_LIBS += ecl 0.0 -CONFIGURE_STYLE = gnu -USE_GMAKE =Yes -USE_LIBTOOL = Yes -NO_REGRESS = Yes +USE_GMAKE =Yes +USE_LIBTOOL = Yes + +NO_REGRESS = Yes + +CONFIGURE_STYLE = gnu +CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ + --enable-boehm=system \ + --with-system-gmp CONFIGURE_ENV += LDFLAGS='-pthread -L${LOCALBASE}/lib' \ CPPFLAGS=-I${LOCALBASE}/include \ CFLAGS='${CFLAGS} -pthread' \ ECLLIB_VERSION=${LIBecl_VERSION} -CONFIGURE_ARGS += --enable-boehm=system \ - --with-system-gmp \ - --with-gmp-prefix=${LOCALBASE} - -MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ +MODGNU_CONFIG_GUESS_DIRS = ${WRKDIST} \ ${WRKDIST}/src \ ${WRKDIST}/src/gc \ ${WRKDIST}/src/gmp - -LIB_DEPENDS += gmp::devel/gmp \ - gc::devel/boehm-gc - -WANTLIB += c m pthread - -post-build: - cd ${WRKBUILD}/build/doc ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET} - -post-install: - cd ${WRKBUILD}/build/doc ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} ${INSTALL_TARGET} - .include bsd.port.mk Index: ecl/distinfo === RCS file: /cvs/ports/lang/ecl/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- ecl/distinfo16 Mar 2009 11:19:12 - 1.3 +++ ecl/distinfo7 Jan 2010 21:11:06 - @@ -1,5 +1,5 @@ -MD5 (ecl-8.12.0.tar.gz) = sEBdAvkZT2+FFX/hYGVMxw== -RMD160 (ecl-8.12.0.tar.gz) = Y8TZNFCxyavyXaE1+v6TrlHu2Jg= -SHA1 (ecl-8.12.0.tar.gz) = 279aggGw4rGJtXX67o+w5bvmTKI= -SHA256 (ecl-8.12.0.tar.gz) = t7OMEclm7GQY29JLymcHEDNEXfThFqDDq4Ij7k1w2r0= -SIZE (ecl-8.12.0.tar.gz) = 5000878 +MD5 (ecl-9.12.3.tgz) = UrKcJLwpxRRPMxTayM3ULQ== +RMD160 (ecl-9.12.3.tgz) = EN6xOTlO3/zo8ff0scaCuahvk9k= +SHA1 (ecl-9.12.3.tgz) = zyk7Ap8zsLD5U56RY2GKnTHfbzA= +SHA256 (ecl-9.12.3.tgz) = 9PLp1YQTDbm7Yb0JpnatZ8XQ8cqAlu14G1CirpnF5oI= +SIZE (ecl-9.12.3.tgz) = 5758828 Index: ecl/patches/patch-src_Makefile_in === RCS file: /cvs/ports/lang/ecl/patches/patch-src_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_Makefile_in --- ecl/patches/patch-src_Makefile_in 16 Mar 2009 11:19:12 - 1.1 +++ ecl/patches/patch-src_Makefile_in 7 Jan 2010 21:11:06 - @@ -1,17 +1,28 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2009/03/16 11:19:12 espie Exp $ src/Makefile.in.orig Wed Dec 17 16:41:52 2008 -+++ src/Makefile.inMon Mar 16 11:25:55 2009 -@@ -143,18 +143,13 @@ install-base: +--- src/Makefile.in.orig Mon Dec 14 14:28:49 2009 src/Makefile.inFri Jan 8 00:30:45 2010 +@@ -122,7 +122,7 @@ BUILD-STAMP: config.status + echo # `uname -a` $@ + head -8 config.log | tail -6 $@ + install: install-base +-# cd doc; $(MAKE) prefix=$(prefix) DESTDIR=$(DESTDIR) install ++ cd doc; $(MAKE) prefix=$(prefix) DESTDIR=$(DESTDIR) install + install-base: + # Here we would use the option -s but the install program in sourceforge-solaris + # is broken. +@@ -151,6 +151,7 @@ install-base: for i in BUILD-STAMP help.doc ; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(ecldir); \ done + cp libecl.so $(LSP_LIBRARIES) for i in $(LSP_LIBRARIES) $(LIBRARIES); do \ if test -s $$i
Re: UPDATE: lang/ecl
Tested on amd64. Work fine. -- Alexandr Shadchin
Re: UPDATE: lang/ecl
On Mon, Dec 28, 2009 at 10:05:09AM +0500, Alexandr Shadchin wrote: Hi, Ports! This update package ECL to the latest release 9.12.3. Tested on i386. Comments ? OK ? This builds and runs on sparc64. I can't really go as far as to OK this, as I have no idea how it works. (maxima tests to follow) -- Best Regards Edd Barrett http://www.theunixzoo.co.uk