From 316ce0a43b9a447515e5ed4e2c7fe1b9c4645c34 Mon Sep 17 00:00:00 2001 From: dkwo 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