From ed7fb8950a6ddcf92d17dfe9e64736a3d4897af0 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 19 Apr 2024 10:20:53 +0900 Subject: [PATCH 1/2] doc/*latex/*geometry.tex: fix typo extreme -> extream, see https://github.com/euslisp/EusLisp/blob/b0dfd7e4feb737909bed67541bf5c6b526c46a4b/lisp/geo/geobody.l#L243 --- doc/jlatex/jgeometry.tex | 2 +- doc/latex/geometry.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/jlatex/jgeometry.tex b/doc/jlatex/jgeometry.tex index fce474e21..a253145c3 100644 --- a/doc/jlatex/jgeometry.tex +++ b/doc/jlatex/jgeometry.tex @@ -179,7 +179,7 @@ \subsection{種々の幾何学関数} このメソッドは、{\bf :intersection}よりも速い。なぜなら、新しい {\bf bounding-box}のインスタンスを作らないためである。} -\methoddesc{:extreme-point}{direction}{ +\methoddesc{:extream-point}{direction}{ この{\bf bounding-box}の8つの頂点の中で、{\em direction}との内積が最大のものを 返す。} diff --git a/doc/latex/geometry.tex b/doc/latex/geometry.tex index 110ab8679..37116944b 100644 --- a/doc/latex/geometry.tex +++ b/doc/latex/geometry.tex @@ -194,7 +194,7 @@ \subsection{Miscellaneous Geometric Functions} This method is faster than {\bf :intersection} because no new instance of bounding-box is created.} -\methoddesc{:extreme-point}{direction}{ +\methoddesc{:extream-point}{direction}{ returns one of the eight corner points yielding the largest dot-product with {\em direction}.} From 7cca3cfeb62ac7c6f19e624e8c407a0cef4a51b3 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 19 Apr 2024 21:03:21 +0900 Subject: [PATCH 2/2] lisp/Makefile.Linux: fix regression, set MACHINE if not defined --- lisp/Makefile.Linux | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lisp/Makefile.Linux b/lisp/Makefile.Linux index 0689d83de..e54a713e6 100644 --- a/lisp/Makefile.Linux +++ b/lisp/Makefile.Linux @@ -59,22 +59,21 @@ $(info "-- GCC_MACHINE = ${GCC_MACHINE}") ifneq ($(GCC_MACHINE),) ifneq (,$(findstring x86_64-linux-gnu,$(GCC_MACHINE))) MACHINE=x86_64 - endif - ifneq (,$(findstring i686-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring i686-linux-gnu,$(GCC_MACHINE))) MACHINE=i686 - endif - ifneq (,$(findstring aarch64-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring aarch64-linux-gnu,$(GCC_MACHINE))) MACHINE=aarch64 - endif - ifneq (,$(findstring arm-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring arm-linux-gnu,$(GCC_MACHINE))) MACHINE=arm - endif - ifneq (,$(findstring powerpc64le-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring powerpc64le-linux-gnu,$(GCC_MACHINE))) MACHINE=ppc64le - endif - ifneq (,$(findstring mips64el-linux-gnu,$(GCC_MACHINE))) + else ifneq (,$(findstring mips64el-linux-gnu,$(GCC_MACHINE))) MACHINE=mips64 + else + MACHINE=$(subst -linux-gnu,,$(GCC_MACHINE)) endif +else + MACHINE=$(shell uname -m) endif # need to set 'i486', for conditionals in c/*.[ch]. ifneq ($(shell gcc -dumpmachine | grep "i.*86-linux"),)