* [PR PATCH] maxima: unbreak ecl build
@ 2023-10-12 21:06 dkwo
2023-10-13 23:44 ` tornaria
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: dkwo @ 2023-10-12 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
There is a new pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages maxima-ecl
https://github.com/void-linux/void-packages/pull/46646
maxima: unbreak ecl build
Fixes the (currently failing, native) build `./xbps-src pkg -o ecl,~sbcl maxima` #46293
Passes local tests with `./xbps-src pkg -f -Q -o ecl,~sbcl maxima` on `x86_64`.
cc @tornaria
A patch file from https://github.com/void-linux/void-packages/pull/46646.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maxima-ecl-46646.patch --]
[-- Type: text/x-diff, Size: 2395 bytes --]
From 316ce0a43b9a447515e5ed4e2c7fe1b9c4645c34 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 12 Oct 2023 16:45:40 -0400
Subject: [PATCH] maxima: unbreak ecl build
---
.../maxima/patches/use-shared-library.patch | 21 -------------------
srcpkgs/maxima/template | 2 --
2 files changed, 23 deletions(-)
delete mode 100644 srcpkgs/maxima/patches/use-shared-library.patch
diff --git a/srcpkgs/maxima/patches/use-shared-library.patch b/srcpkgs/maxima/patches/use-shared-library.patch
deleted file mode 100644
index a8f986ac7033c..0000000000000
--- a/srcpkgs/maxima/patches/use-shared-library.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/maxima.system 2021-12-02 00:26:23.955984864 -0300
-+++ b/src/maxima.system 2021-12-02 00:31:22.299541969 -0300
-@@ -87,13 +87,15 @@
- (let ((obj (mapcar #'(lambda (p)
- ;; Convert dir/foo.fas to dir/foo.o
- (make-pathname :type "o" :defaults p))
-- files)))
-- (c::build-fasl "binary-ecl/maxima" :lisp-files obj
-+ files))
-+ (lib '("binary-ecl/libmaxima-ecl.so")))
-+ (c::build-shared-library "binary-ecl/maxima-ecl" :lisp-files obj)
-+ (c::build-fasl "binary-ecl/maxima" :lisp-files lib
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- (find-package "MAXIMA")))))
- (if (and x (not (string= x ""))) (split-string x))))
-- (c::build-program "binary-ecl/maxima" :lisp-files obj
-+ (c::build-program "binary-ecl/maxima" :lisp-files lib
- :ld-flags
- (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*"
- (find-package "MAXIMA")))))
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index ef46df5b713ce..a135cb951bda5 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -52,7 +52,6 @@ post_configure() {
post_build() {
if [ "$build_option_ecl" ]; then
# everything will go in the same directory, use rpath=$ORIGIN
- patchelf --remove-rpath src/binary-ecl/libmaxima-ecl.so
patchelf --set-rpath \$ORIGIN \
src/binary-ecl/{maxima,maxima.fas}
patchelf \
@@ -135,7 +134,6 @@ maxima-ecl_package() {
pkg_install() {
BINARY_ECL=/usr/lib/maxima/${version}/binary-ecl
vmove ${BINARY_ECL}
- vinstall src/binary-ecl/libmaxima-ecl.so 755 ${BINARY_ECL}
vinstall src/binary-ecl/maxima.fas 755 ${BINARY_ECL}
# symlink maxima.fas in ECLDIR
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: maxima: unbreak ecl build
2023-10-12 21:06 [PR PATCH] maxima: unbreak ecl build dkwo
@ 2023-10-13 23:44 ` tornaria
2023-10-14 19:44 ` [PR PATCH] [Updated] " dkwo
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: tornaria @ 2023-10-13 23:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/46646#issuecomment-1762380739
Comment:
Can you try this instead:
```diff
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -46,6 +46,8 @@ post_configure() {
touch -c doc/info/*.html
touch -c doc/info/maxima.info*
touch -c doc/info/maxima_toc.html
+ touch -c doc/info/maxima-index.lisp
+ touch -c doc/info/maxima-index-html.lisp
touch -c interfaces/xmaxima/doc/xmaxima.html
}
```
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] maxima: unbreak ecl build
2023-10-12 21:06 [PR PATCH] maxima: unbreak ecl build dkwo
2023-10-13 23:44 ` tornaria
@ 2023-10-14 19:44 ` dkwo
2023-10-14 19:47 ` dkwo
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: dkwo @ 2023-10-14 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages maxima-ecl
https://github.com/void-linux/void-packages/pull/46646
maxima: unbreak ecl build
Fixes the (currently failing, native) build `./xbps-src pkg -o ecl,~sbcl maxima` #46293
Passes local tests with `./xbps-src pkg -f -Q -o ecl,~sbcl maxima` on `x86_64`.
cc @tornaria
A patch file from https://github.com/void-linux/void-packages/pull/46646.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maxima-ecl-46646.patch --]
[-- Type: text/x-diff, Size: 997 bytes --]
From d7da84775447138b8e2095cd7744dfd8209fa1c2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 14 Oct 2023 15:44:14 -0400
Subject: [PATCH] maxima: unbreak ecl build
---
srcpkgs/maxima/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/maxima/template b/srcpkgs/maxima/template
index ef46df5b713ce..fb8b6b7059da4 100644
--- a/srcpkgs/maxima/template
+++ b/srcpkgs/maxima/template
@@ -1,7 +1,7 @@
# Template file for 'maxima'
pkgname=maxima
version=5.47.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="$(vopt_enable clisp) $(vopt_enable sbcl sbcl-exec) $(vopt_enable ecl)"
hostmakedepends="python3 perl texinfo patchelf $(vopt_if ecl ecl)"
@@ -46,6 +46,8 @@ post_configure() {
touch -c doc/info/*.html
touch -c doc/info/maxima.info*
touch -c doc/info/maxima_toc.html
+ touch -c doc/info/maxima-index.lisp
+ touch -c doc/info/maxima-index-html.lisp
touch -c interfaces/xmaxima/doc/xmaxima.html
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: maxima: unbreak ecl build
2023-10-12 21:06 [PR PATCH] maxima: unbreak ecl build dkwo
2023-10-13 23:44 ` tornaria
2023-10-14 19:44 ` [PR PATCH] [Updated] " dkwo
@ 2023-10-14 19:47 ` dkwo
2023-10-16 14:33 ` tornaria
2023-10-16 18:02 ` [PR PATCH] [Closed]: " dkwo
4 siblings, 0 replies; 6+ messages in thread
From: dkwo @ 2023-10-14 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/46646#issuecomment-1763161026
Comment:
this also works, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: maxima: unbreak ecl build
2023-10-12 21:06 [PR PATCH] maxima: unbreak ecl build dkwo
` (2 preceding siblings ...)
2023-10-14 19:47 ` dkwo
@ 2023-10-16 14:33 ` tornaria
2023-10-16 18:02 ` [PR PATCH] [Closed]: " dkwo
4 siblings, 0 replies; 6+ messages in thread
From: tornaria @ 2023-10-16 14:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/46646#issuecomment-1764615152
Comment:
This is superseded by #46709. Let's merge that one instead.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: maxima: unbreak ecl build
2023-10-12 21:06 [PR PATCH] maxima: unbreak ecl build dkwo
` (3 preceding siblings ...)
2023-10-16 14:33 ` tornaria
@ 2023-10-16 18:02 ` dkwo
4 siblings, 0 replies; 6+ messages in thread
From: dkwo @ 2023-10-16 18:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There's a closed pull request on the void-packages repository
maxima: unbreak ecl build
https://github.com/void-linux/void-packages/pull/46646
Description:
Fixes the (currently failing, native) build `./xbps-src pkg -o ecl,~sbcl maxima` #46293
Passes local tests with `./xbps-src pkg -f -Q -o ecl,~sbcl maxima` on `x86_64`.
cc @tornaria
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-16 18:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-12 21:06 [PR PATCH] maxima: unbreak ecl build dkwo
2023-10-13 23:44 ` tornaria
2023-10-14 19:44 ` [PR PATCH] [Updated] " dkwo
2023-10-14 19:47 ` dkwo
2023-10-16 14:33 ` tornaria
2023-10-16 18:02 ` [PR PATCH] [Closed]: " dkwo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).