Re: (maintainer update) lang/ecl-24.5.10
On Mon, Aug 12 2024, Sebastien Marie wrote:
> Hi,
>
> Just some comments.
>
> Timo Myyrä writes:
>
>> Hi,
>>
>> Here's a bit long overdue update for the ECL port.
>> Lightly tested on amd64.
>>
>> timo
>>
>> diff /usr/ports
>> commit - 91c62197c95d894e5fecbb4866735eb37d9ec02a
>> path + /usr/ports
>> blob - 5d1ff4982781db1ed5fc9dfa5c1fb5c2680b06af
>> file + lang/ecl/Makefile
>> --- lang/ecl/Makefile
>> +++ lang/ecl/Makefile
>> @@ -1,9 +1,9 @@
>> COMMENT = embeddable common-lisp
>> CATEGORIES =lang
>>
>> -V = 21.2.1
>> +V = 24.5.10
>> DISTNAME = ecl-$V
>> -SHARED_LIBS += ecl 8.0
>> +SHARED_LIBS += ecl 9.0
>>
>> REVISION = 0
>
> REVISION should be removed
>
>
> And the regress doesn't work anymore: ecl use explicitly /bin/bash for
> testing.
>
> So I also have:
>
> -TEST_DEPENDS = ${BASE_PKGPATH}
> +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
> + shells/bash
>
> And a patch for src/tests/Makefile.in
>
> blob - /dev/null
> file + lang/ecl/patches/patch-src_tests_Makefile_in (mode 644)
> --- /dev/null
> +++ lang/ecl/patches/patch-src_tests_Makefile_in
> @@ -0,0 +1,12 @@
> +Index: src/tests/Makefile.in
> +--- src/tests/Makefile.in.orig
> src/tests/Makefile.in
> +@@ -2,7 +2,7 @@
> + # vim: set filetype=makefile tabstop=8 shiftwidth=4 expandtab:
> +
> + ECL=@prefix@/@bindir@/ecl@EXEEXT@
> +-SHELL=/bin/bash -o pipefail
> ++SHELL=bash -o pipefail
> +
> + .PHONY: all check ansi-test
> +
>
>
> Thanks.
Here is an updated diff which drops REVISION and uses /bin/ksh for the
regression tests. Note that tests fail with "Signals delivery fails
constantly at GC #x" error. This is fixed by devel/boehm-gc update send
earlier.
Timo
diff /usr/ports
commit - 8e4b8dff34f8c8a46b16f8f5f305a301d14bbf3d
path + /usr/ports
blob - 5d1ff4982781db1ed5fc9dfa5c1fb5c2680b06af
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 = 24.5.10
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
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-24.5.10.tgz) = 5Opluxhh4OSVOGv6i8ZzvQFOltPPnZHpA4+RQ1y+Yis=
+SIZE (ecl-24.5.10.tgz) = 8130112
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 - 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
-
-In
Re: (maintainer update) lang/ecl-24.5.10
On Mon, Aug 12 2024, Sebastien Marie wrote:
Ah, should have paid a bit more attentive while looking at the diff.
Does the bash dependency really bring anything to table? I looked at the
Makefile.in and it seems to only use it for the pipefail option. The
option is supported by ksh as well so is the /bin/ksh as a shell enough?
Timo
> Hi,
>
> Just some comments.
>
> Timo Myyrä writes:
>
>> Hi,
>>
>> Here's a bit long overdue update for the ECL port.
>> Lightly tested on amd64.
>>
>> timo
>>
>> diff /usr/ports
>> commit - 91c62197c95d894e5fecbb4866735eb37d9ec02a
>> path + /usr/ports
>> blob - 5d1ff4982781db1ed5fc9dfa5c1fb5c2680b06af
>> file + lang/ecl/Makefile
>> --- lang/ecl/Makefile
>> +++ lang/ecl/Makefile
>> @@ -1,9 +1,9 @@
>> COMMENT = embeddable common-lisp
>> CATEGORIES =lang
>>
>> -V = 21.2.1
>> +V = 24.5.10
>> DISTNAME = ecl-$V
>> -SHARED_LIBS += ecl 8.0
>> +SHARED_LIBS += ecl 9.0
>>
>> REVISION = 0
>
> REVISION should be removed
>
>
> And the regress doesn't work anymore: ecl use explicitly /bin/bash for
> testing.
>
> So I also have:
>
> -TEST_DEPENDS = ${BASE_PKGPATH}
> +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
> + shells/bash
>
> And a patch for src/tests/Makefile.in
>
> blob - /dev/null
> file + lang/ecl/patches/patch-src_tests_Makefile_in (mode 644)
> --- /dev/null
> +++ lang/ecl/patches/patch-src_tests_Makefile_in
> @@ -0,0 +1,12 @@
> +Index: src/tests/Makefile.in
> +--- src/tests/Makefile.in.orig
> src/tests/Makefile.in
> +@@ -2,7 +2,7 @@
> + # vim: set filetype=makefile tabstop=8 shiftwidth=4 expandtab:
> +
> + ECL=@prefix@/@bindir@/ecl@EXEEXT@
> +-SHELL=/bin/bash -o pipefail
> ++SHELL=bash -o pipefail
> +
> + .PHONY: all check ansi-test
> +
>
>
> Thanks.
Re: (maintainer update) lang/ecl-24.5.10
Hi,
Just some comments.
Timo Myyrä writes:
> Hi,
>
> Here's a bit long overdue update for the ECL port.
> Lightly tested on amd64.
>
> timo
>
> diff /usr/ports
> commit - 91c62197c95d894e5fecbb4866735eb37d9ec02a
> path + /usr/ports
> blob - 5d1ff4982781db1ed5fc9dfa5c1fb5c2680b06af
> file + lang/ecl/Makefile
> --- lang/ecl/Makefile
> +++ lang/ecl/Makefile
> @@ -1,9 +1,9 @@
> COMMENT =embeddable common-lisp
> CATEGORIES = lang
>
> -V = 21.2.1
> +V = 24.5.10
> DISTNAME = ecl-$V
> -SHARED_LIBS += ecl 8.0
> +SHARED_LIBS += ecl 9.0
>
> REVISION = 0
REVISION should be removed
And the regress doesn't work anymore: ecl use explicitly /bin/bash for
testing.
So I also have:
-TEST_DEPENDS = ${BASE_PKGPATH}
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
+ shells/bash
And a patch for src/tests/Makefile.in
blob - /dev/null
file + lang/ecl/patches/patch-src_tests_Makefile_in (mode 644)
--- /dev/null
+++ lang/ecl/patches/patch-src_tests_Makefile_in
@@ -0,0 +1,12 @@
+Index: src/tests/Makefile.in
+--- src/tests/Makefile.in.orig
src/tests/Makefile.in
+@@ -2,7 +2,7 @@
+ # vim: set filetype=makefile tabstop=8 shiftwidth=4 expandtab:
+
+ ECL=@prefix@/@bindir@/ecl@EXEEXT@
+-SHELL=/bin/bash -o pipefail
++SHELL=bash -o pipefail
+
+ .PHONY: all check ansi-test
+
Thanks.
--
Sebastien Marie
(maintainer update) lang/ecl-24.5.10
Hi, Here's a bit long overdue update for the ECL port. Lightly tested on amd64. timo diff /usr/ports commit - 91c62197c95d894e5fecbb4866735eb37d9ec02a path + /usr/ports blob - 5d1ff4982781db1ed5fc9dfa5c1fb5c2680b06af file + lang/ecl/Makefile --- lang/ecl/Makefile +++ lang/ecl/Makefile @@ -1,9 +1,9 @@ COMMENT = embeddable common-lisp CATEGORIES = lang -V =21.2.1 +V =24.5.10 DISTNAME = ecl-$V -SHARED_LIBS += ecl 8.0 +SHARED_LIBS += ecl 9.0 REVISION = 0 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-24.5.10.tgz) = 5Opluxhh4OSVOGv6i8ZzvQFOltPPnZHpA4+RQ1y+Yis= +SIZE (ecl-24.5.10.tgz) = 8130112 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 644) --- /dev/null +++ lang/ecl/patches/patch-src_cmp_cmpbackend-cxx_cmpbackend-cxx_lsp @@ -0,0 +1,17 @@ +Index: src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp +--- src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp.orig src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp +@@ -278,12 +278,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*))) +- *ecl-library-directory*) ++ (cond ((and *ecl-library-directory* *ecl-library-directory*)) + ((probe-file "SYS:BUILD-STAMP") + (setf *ecl-library-directory* (namestring (translate-logical-pathname "SYS:" + ((error "Unable to find library directory" 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 &optional 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
(maintainer update) lang/ecl-24.5.10
Hi, Here's a bit delayed update for the lang/ecl port. Slightly tested on amd64, could use bigger testing as well. Timo diff /usr/ports commit - 91c62197c95d894e5fecbb4866735eb37d9ec02a path + /usr/ports blob - 5d1ff4982781db1ed5fc9dfa5c1fb5c2680b06af file + lang/ecl/Makefile --- lang/ecl/Makefile +++ lang/ecl/Makefile @@ -1,9 +1,9 @@ COMMENT = embeddable common-lisp CATEGORIES = lang -V =21.2.1 +V =24.5.10 DISTNAME = ecl-$V -SHARED_LIBS += ecl 8.0 +SHARED_LIBS += ecl 9.0 REVISION = 0 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-24.5.10.tgz) = 5Opluxhh4OSVOGv6i8ZzvQFOltPPnZHpA4+RQ1y+Yis= +SIZE (ecl-24.5.10.tgz) = 8130112 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 644) --- /dev/null +++ lang/ecl/patches/patch-src_cmp_cmpbackend-cxx_cmpbackend-cxx_lsp @@ -0,0 +1,17 @@ +Index: src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp +--- src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp.orig src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp +@@ -278,12 +278,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*))) +- *ecl-library-directory*) ++ (cond ((and *ecl-library-directory* *ecl-library-directory*)) + ((probe-file "SYS:BUILD-STAMP") + (setf *ecl-library-directory* (namestring (translate-logical-pathname "SYS:" + ((error "Unable to find library directory" 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 &optional 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 ge
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 &optional vv)
-+ (declare (ignore vv))
-+ (princ value *compiler-output1*)
-+ ;; Specify explicit type
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 &optional 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 &optional vv)
++ (declare (ignore vv))
+ (wt value))
+
+ (defun wt-character (value &optional 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-c
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
s/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_h4 Apr
> 2020 20:59:41 - 1.3
> +++ patches/patch-libatomic_ops_src_atomic_ops_sysdeps_gcc_sparc_h30 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_ops/sysdeps/gcc/sparc.h
> --- libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h.orig
> +++ libatomic_ops/src/atomic_ops/sysdeps/gcc/sparc.h
> @@ -14,3 +16,26 @@ Index: libatomic_ops/src/atomic_ops/sysd
> __asm__ __volatile__ ("membar #StoreLoad | #LoadLoad\n\t"
> # if defined(__arch64__)
> "casx [%2],%0,%1\n\t"
> +@@ -61,7 +61,21 @@ AO_compare_and_swap_full(volatile AO_t *addr, AO_t old
> + }
> + #define AO_HAVE_compare_and_swap_full
> +
> +-/* TODO: implement AO_fetch_compare_and_swap. */
> ++AO_INLINE AO_t
> ++AO_fetch_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val)
> {
> ++ __asm__ __volatile__ ("membar #StoreLoad | #LoadLoad\n\t"
> ++# if defined(__arch64__)
> ++ "casx [%1],%2,%0\n\t"
> ++# else
> ++ "cas [%1],%2,%0\n\t" /* 32-bit version */
> ++# endif
> ++"membar #StoreLoad | #StoreStore\n\t"
> ++: "+r" (new_val)
> ++: "r" (addr), "r" (old)
> ++: "memory");
> ++ return new_val;
> ++}
> ++#define AO_HAVE_fetch_compare_and_swap_full
> + #endif /* !AO_NO_SPARC_V9 */
> +
> + /* TODO: Extend this for SPARC v8 and v9 (V8 also has swap, V9 has CAS, */
>
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
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 (%% = 9.765625E-4) or %%) 1024.0 Result: true ... Which was correct, but was expected to be wrong due to a known bug in Maxima or ECL. 42/42 tests passed (not counting 3 expected errors) The following 2 problems passed but were expected to fail: (43
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/f
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/pa
Re: lang/ecl
Daniel Jakots writes: > 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
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
+
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 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. Cheers, Daniel
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."
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
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
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
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
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);; \
+
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: 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 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 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: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) -- Alexandr Shadchin
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."
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
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 \
++ $(
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
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_LIBRAR
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
