<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/14673efd733cd612831510739fd4057eaf809a72">https://github.com/macports/macports-ports/commit/14673efd733cd612831510739fd4057eaf809a72</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 14673efd733 fricas: added a patch for SBCL_HOME
</span>14673efd733 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 14673efd733cd612831510739fd4057eaf809a72
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Oct 28 18:50:13 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> fricas: added a patch for SBCL_HOME
</span>---
math/fricas/Portfile | 7 ++-
math/fricas/files/sbcl-home.patch | 115 ++++++++++++++++++++++++++++++++++++++
2 files changed, 120 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fricas/Portfile b/math/fricas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16a5337eb18..5118b9b5119 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/fricas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fricas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name fricas
version 1.3.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories math
maintainers {@pietvo vanoostrum.org:pieter}
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,8 @@ checksums rmd160 1c1b051cf333325b0e5a75e319e01d88113ec85c \
</span> sha256 6a60063cb428ef49ca013c9933b877c97e66314c42c0e1706ff7d32160798544 \
size 10878913
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles sbcl-home.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.dir ${workpath}/fricas-build
configure.cmd ${worksrcpath}/configure
pre-configure {file mkdir ${configure.dir}}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +61,8 @@ variant sbcl conflicts ccl ecl \
</span> description {Use SBCL as lisp implementation} {
depends_lib-append port:sbcl
configure.args-append --with-lisp='sbcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --control-stack-size 512 --dynamic-space-size 6000'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --control-stack-size 512 --dynamic-space-size 6000' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sbcl-home=${prefix}/lib/sbcl
</span> }
if { ${configure.build_arch} eq "x86_64" } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fricas/files/sbcl-home.patch b/math/fricas/files/sbcl-home.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..35eb3fd7378
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fricas/files/sbcl-home.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,115 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 0a6b5f7ffdebfed60f80da777318d0a41c5fee5a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri Oct 28 18:45:26 2022 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Introduced a way to hardcode SBCL_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ I've added a configure argument `--with-sbcl-home` which allows to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ specify desired `SBCL_HOME`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Without it fricas' lisp can't be really used without specification of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `SBCL_HOME` environment variable at some cases that leads to wired
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ issue like:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ```
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (1) -> )lisp (require :asdf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ >> System error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Don't know how to REQUIRE ASDF.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See also:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The SBCL Manual, Variable SB-EXT:*MODULE-PROVIDER-FUNCTIONS*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The SBCL Manual, Function REQUIRE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (1) ->
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ```
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Makefile.in Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d814d46f..75c07d2b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,6 +142,9 @@ install-src:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo FRICAS_VERSION='"${PACKAGE_VERSION}"' >> '${COMMAND}'.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo FRICAS_LISP_FLAVOR='"${FRICAS_LISP_FLAVOR}"' >> '${COMMAND}'.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo FRICAS_LISP_VERSION='"${FRICAS_LISP_VERSION}"' >> '${COMMAND}'.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test "x$(SBCL_HOME)" != "x" ; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo export SBCL_HOME='"$${SBCL_HOME:-$(SBCL_HOME)}"' >> '${COMMAND}'.tmp ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat $(fricas_src_srcdir)/etc/fricas >> '${COMMAND}'.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_SCRIPT) '${COMMAND}'.tmp '${COMMAND}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -rm '${COMMAND}'.tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git config/var-def.mk config/var-def.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2247de76..65d09551 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/var-def.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/var-def.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,6 +170,8 @@ FASLEXT = @fricas_fasl_type2@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRICAS_LISP_FLAVOR=@fricas_lisp_flavor@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRICAS_LISP_VERSION=@fricas_lisp_version@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SBCL_HOME=@sbcl_home@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 804f0364..db73e99c 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,6 +663,7 @@ GMP_LIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMP_LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMP_CPPFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMP_WRAP_SO_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++sbcl_home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOLIB_FLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBSPAD_SO_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fricas_lisp_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -752,6 +753,7 @@ enable_case_insensitive_file_system_check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_pre_generated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_lisp_flavor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++with_sbcl_home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_gmp_include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with_gmp_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1419,6 +1421,7 @@ Optional Packages:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lisp=L use L as Lisp platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-lisp-flavor=F obsolete and ignored
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --with-sbcl-home=PATH specify the path of hardcoded SBCL_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gmp=PATH specify prefix directory for the installed GMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ package. Equivalent to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gmp-include=PATH/include plus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4202,6 +4205,17 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## Configure desired SBCL_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Check whether --with-sbcl-home was given.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "${with_sbcl_home+set}" = set; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ withval=$with_sbcl_home; sbcl_home=$withval
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sbcl_home=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## In case our underlying lisp is SBCL or Closure CL, we provide a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## wrapper to enable GMP bignums in lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMP_WRAP_SO_TARGET=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ff7fe65c..650ad5a6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -325,6 +325,13 @@ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(LIBSPAD_SO_TARGET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(SOLIB_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## Configure desired SBCL_HOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([sbcl-home],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS_HELP_STRING([--with-sbcl-home=PATH], [specify the path of hardcoded SBCL_HOME]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sbcl_home=$withval,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sbcl_home="")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_SUBST(sbcl_home)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## In case our underlying lisp is SBCL or Closure CL, we provide a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## wrapper to enable GMP bignums in lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GMP_WRAP_SO_TARGET=""
</span></pre><pre style='margin:0'>
</pre>